diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-24 02:23:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 02:23:22 (GMT) |
| commit | e596cdddf349b244dca854bf5a7aa9428b48fc50 (patch) | |
| tree | 028d41aafe66425381298839f8e9dea3b2b09a5e /builtin-merge.c | |
| parent | 131f9a108bba5a8b0bcba072696653ab3199911a (diff) | |
| download | git-e596cdddf349b244dca854bf5a7aa9428b48fc50.zip git-e596cdddf349b244dca854bf5a7aa9428b48fc50.tar.gz git-e596cdddf349b244dca854bf5a7aa9428b48fc50.tar.bz2 | |
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>
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions