diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:29:05 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:37:04 -0700 |
| commit | a0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d (patch) | |
| tree | f8f06b2f4d13cbb721a17892ee543d5b6265bdb7 /Documentation/git-show.txt | |
| parent | merge-recursive: Delay modify/delete conflicts if D/F conflict present (diff) | |
| download | tgif-a0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d.tar.xz | |
conflict_rename_delete(): Check whether D/F conflicts are still present
If all the paths below some directory involved in a D/F conflict were not
removed during the rest of the merge, then the contents of the file whose
path conflicted needs to be recorded in file with an alternative filename.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-show.txt')
0 files changed, 0 insertions, 0 deletions