projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 36de170) | patch
merge-recursive: Update merge_content() call signature
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:58 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:03 +0000 (17:37 -0700)
commit61b8bcae2d8f71c566150b0a12e35a9fdc76b82b
treedb82c5229fe0f9af93c694923ae97531ce5b5b6btree | snapshot
parent36de17048aaa3c3011c8b4ee1f89ee65b7ad2f99commit | diff
merge-recursive: Update merge_content() call signature

Enable calling merge_content() and providing more information about renames
and D/F conflicts (which we will want to do from process_df_entry()).

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c diff | blob | history
Git—the stupid content tracker