summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-11 01:36:08 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 03:40:20 (GMT)
commit03efa6d9a4c974c502dbad457749ad316aac9cc6 (patch)
tree2cef3d82c6d57bcee34cf6b12b471127b4158d54 /t/t1000-read-tree-m-3way.sh
parent76bc82ca0ed4a0af85b7d741c04c8191738e8395 (diff)
downloadgit-03efa6d9a4c974c502dbad457749ad316aac9cc6.zip
git-03efa6d9a4c974c502dbad457749ad316aac9cc6.tar.gz
git-03efa6d9a4c974c502dbad457749ad316aac9cc6.tar.bz2
[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 't/t1000-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions