diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-06-10 18:36:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-12 20:40:20 -0700 |
| commit | 03efa6d9a4c974c502dbad457749ad316aac9cc6 (patch) | |
| tree | 2cef3d82c6d57bcee34cf6b12b471127b4158d54 /commit-tree.c | |
| parent | [PATCH] Clean up read-tree two-way tests. (diff) | |
| download | git-03efa6d9a4c974c502dbad457749ad316aac9cc6.tar.gz git-03efa6d9a4c974c502dbad457749ad316aac9cc6.zip | |
[PATCH] read-tree --emu23.
This new flag causes two-way fast forward to internally use the
three-way merge mechanism. This behaviour is intended to offer
a better fast forward semantics when used in a dirty work tree.
The new test t1005 is parallel to the existing t1001 "pure
2-way" tests, but some parts that are commented out would fail.
These failures are due to three-way merge enforcing too strict
index requirements for cases that could succeed. This problem
will be addressed by later patches.
Without even changing three-way mechanism, the --emu23 two-way
fast forward already gives the user an easier-to-handle merge
result when a file that "merged head" updates has local
modifications. This is demonstrated as "case 16" test in t1005.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'commit-tree.c')
0 files changed, 0 insertions, 0 deletions