| commit | e596cdddf349b244dca854bf5a7aa9428b48fc50 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 02:23:22 +0000 (23 19:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 02:23:22 +0000 (23 19:23 -0700) | ||
| tree | 028d41aafe66425381298839f8e9dea3b2b09a5e | treesnapshot (tar.gz zip) |
| parent | 131f9a108bba5a8b0bcba072696653ab3199911a | commitdiff |
t7606: fix custom merge test
Custom merge strategy does not even kick in when the merge is truly
trivial. The test depended on the behaviour in the git-merge rewritten in
C that broke the trivial merge completely.
Make the test to work on a non-trivial merge to make sure the strategy
kicks in.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Custom merge strategy does not even kick in when the merge is truly
trivial. The test depended on the behaviour in the git-merge rewritten in
C that broke the trivial merge completely.
Make the test to work on a non-trivial merge to make sure the strategy
kicks in.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7606-merge-custom.sh | diffblobblamehistory |