diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:57 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:03 -0700 |
| commit | 36de17048aaa3c3011c8b4ee1f89ee65b7ad2f99 (patch) | |
| tree | d27ed1185c7467a52730746b2c0b0fe26ee90b59 /contrib/ciabot/ciabot.py | |
| parent | merge-recursive: Structure process_df_entry() to handle more cases (diff) | |
| download | tgif-36de17048aaa3c3011c8b4ee1f89ee65b7ad2f99.tar.xz | |
merge-recursive: Update conflict_rename_rename_1to2() call signature
To facilitate having this function called later using information stored
in a rename_df_conflict_info struct, accept a diff_filepair instead of a
rename.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/ciabot/ciabot.py')
0 files changed, 0 insertions, 0 deletions