2 Commits

Author	SHA1	Message	Date
Junio C Hamano	e596cdddf3	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>	2008-08-23 19:23:22 -07:00
Miklos Vajna	1b1d78fe77	Add a new test for using a custom merge strategy ... Testing is done by creating a simple git-merge-theirs strategy which is the opposite of ours. Using this in real merges is not recommended but it's perfect for our testing needs. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-07-29 23:21:36 -07:00