diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:17:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-19 20:33:38 -0700 |
| commit | 6db41050a360d83e89114602ecc81c208323080f (patch) | |
| tree | 7a9f293d1cb3441cb34fec70cfd0a307302c21a3 /fsck.c | |
| parent | d192508cd6867059ccc4ce0946ec1110028dad37 (diff) | |
| download | git-6db41050a360d83e89114602ecc81c208323080f.tar.gz git-6db41050a360d83e89114602ecc81c208323080f.tar.xz | |
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.
Diffstat (limited to 'fsck.c')
0 files changed, 0 insertions, 0 deletions