| commit | 1b1d78fe77d676bb79a9272ff6f3517697811990 | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Tue, 29 Jul 2008 23:17:00 +0000 (30 01:17 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Jul 2008 06:21:36 +0000 (29 23:21 -0700) | ||
| tree | 98f6958d8d1435b5c359b791f20d75c56c487791 | treesnapshot (tar.gz zip) |
| parent | 87091b495e8af0daf317c0d0e08ac3ead74a0bb9 | commitdiff |
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>
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>
| t/t7606-merge-custom.sh | [new file with mode: 0755] | blob |