diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-08-14 15:33:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-14 22:20:01 -0700 |
| commit | b798671fa935492ce511766bc99fb26b2892499b (patch) | |
| tree | 6a28de76dea881193189cee59a6c499a254d4767 /sha1_file.c | |
| parent | Add --log-size to git log to print message size (diff) | |
| download | tgif-b798671fa935492ce511766bc99fb26b2892499b.tar.xz | |
merge-recursive: do not rudely die on binary merge
When you try to merge a path that involves binary file-level
merge, merge-recursive died rudely without cleaning up its own
mess. A files added by the merge were left in the working tree,
but the index was not written out (because it just punted and
died), so it was cumbersome for the user to retry it by first
running "git reset --hard".
This changes merge-recursive to still warn but do the "binary"
merge for such a path; leave the "our" version in the working
tree, but still keep the path unmerged so that the user can sort
it out.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions