Techlive Zheng 4f96fcc9a2 contrib/subtree: Add merge tests ...

Add some tests for various merge operations.  Test combinations of merge
with --message, --prefix and --squash.

Signed-off-by: Techlive Zheng <techlivezheng@gmail.com>
Signed-off-by: David A. Greene <greened@obbligato.org>
Signed-off-by: Jeff King <peff@peff.net>

2015-11-13 00:02:56 -05:00

..

Makefile

contrib/subtree: Clean and refactor test code

2015-11-13 00:02:56 -05:00

t7900-subtree.sh

contrib/subtree: Add merge tests

2015-11-13 00:02:56 -05:00