| commit | 6db41050a360d83e89114602ecc81c208323080f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:17:44 +0000 (19 20:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:33:38 +0000 (19 20:33 -0700) | ||
| tree | 7a9f293d1cb3441cb34fec70cfd0a307302c21a3 | treesnapshot (tar.gz zip) |
| parent | d192508cd6867059ccc4ce0946ec1110028dad37 | commitdiff |
Revert "Merge branch 'en/merge-recursive'"
As the band-aid to merge-recursive seems to regress complex merges in an
unpleasant way. The merge-recursive implementation needs to be rewritten
in such a way that it resolves renames and D/F conflicts entirely in-core
and not to touch working tree at all while doing so. But in the meantime,
this reverts commit ac9666f84 that merged the topic in its entirety.
As the band-aid to merge-recursive seems to regress complex merges in an
unpleasant way. The merge-recursive implementation needs to be rewritten
in such a way that it resolves renames and D/F conflicts entirely in-core
and not to touch working tree at all while doing so. But in the meantime,
this reverts commit ac9666f84 that merged the topic in its entirety.
| merge-recursive.c | diffblobblamehistory | |
| t/t6022-merge-rename.sh | diffblobblamehistory |