diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:03 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:04 -0700 |
| commit | 882fd11aff6f0e8add77e75924678cce875a0eaf (patch) | |
| tree | afdfb547ff6ad755596808098986c20a31755a37 /Documentation/git-cat-file.txt | |
| parent | merge-recursive: Delay handling of rename/delete conflicts (diff) | |
| download | tgif-882fd11aff6f0e8add77e75924678cce875a0eaf.tar.xz | |
merge-recursive: Delay content merging for renames
Move the handling of content merging for renames from process_renames() to
process_df_entry().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cat-file.txt')
0 files changed, 0 insertions, 0 deletions