diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-06-11 02:53:57 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-12 20:40:20 -0700 |
| commit | 036d51cc557bcf919246ad30cb2ac7736bfc836b (patch) | |
| tree | 0691823355c5aa9b395fab377e11582808d38687 /init-db.c | |
| parent | [PATCH] Finish making --emu23 equivalent to pure 2-way merge. (diff) | |
| download | tgif-036d51cc557bcf919246ad30cb2ac7736bfc836b.tar.xz | |
[PATCH] read-tree: loosen too strict index requirements
This patch teaches read-tree 3-way merge that, when only "the
other tree" changed a path, and if the index file already has
the same change, we are not in a situation that would clobber
the index and the work tree, and lets the merge succeed; this is
case #14ALT in t1000 test. It does not change the result of the
merge, but prevents it from failing when it does not have to.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init-db.c')
0 files changed, 0 insertions, 0 deletions