t6031: generalize for recursive and resolve strategies
authorJeff King <peff@peff.net>
Mon, 26 Oct 2015 21:37:18 +0000 (17:37 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Oct 2015 21:48:56 +0000 (14:48 -0700)
commitf78d1fe...08d3db36afecbd8b8a84d6c35391bd0b
tree77f69c3...562a872c233a4349f0fee1729614fcffcopy hash to clipboard (tree)
parent6f50833...98d9d88e331a0d5022130dd3d49cf876copy hash to clipboard (diff)
t/t6031-merge-filemode.sh [new file with mode: 0755]
t/t6031-merge-recursive.sh [deleted file]