diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-08-23 19:23:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-23 19:23:22 -0700 |
| commit | e596cdddf349b244dca854bf5a7aa9428b48fc50 (patch) | |
| tree | 028d41aafe66425381298839f8e9dea3b2b09a5e /Documentation/git-merge.txt | |
| parent | Fix "git-merge -s bogo" help text (diff) | |
| download | tgif-e596cdddf349b244dca854bf5a7aa9428b48fc50.tar.xz | |
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 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions