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: NMiklos Vajna <vmiklos@frugalware.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Showing
t/t7606-merge-custom.sh
0 → 100755
想要评论请 注册 或 登录