![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Elijah Newren <newren@gmail.com> | |
| Mon, 20 Sep 2010 08:28:57 +0000 (02:28 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 00:37:03 +0000 (17:37 -0700) | ||
| commit | 36de17048aaa3c3011c8b4ee1f89ee65b7ad2f99 | |
| tree | d27ed1185c7467a52730746b2c0b0fe26ee90b59 | tree | snapshot |
| parent | 9c0bbb50f0dd916fe1684991d10d93f3c67311ba | commit | diff |
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>
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>
| merge-recursive.c | diff | blob | history |