]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9c0bbb5) | patch
merge-recursive: Update conflict_rename_rename_1to2() call signature
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:57 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:03 +0000 (17:37 -0700)
commit36de17048aaa3c3011c8b4ee1f89ee65b7ad2f99
treed27ed1185c7467a52730746b2c0b0fe26ee90b59tree | snapshot
parent9c0bbb50f0dd916fe1684991d10d93f3c67311bacommit | 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>
merge-recursive.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.