diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:58 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:03 -0700 |
| commit | 61b8bcae2d8f71c566150b0a12e35a9fdc76b82b (patch) | |
| tree | db82c5229fe0f9af93c694923ae97531ce5b5b6b /t/t7606-merge-custom.sh | |
| parent | merge-recursive: Update conflict_rename_rename_1to2() call signature (diff) | |
| download | tgif-61b8bcae2d8f71c566150b0a12e35a9fdc76b82b.tar.xz | |
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>
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions