[PATCH 4/7] contrib/subtree: Add merge tests

2015-11-12 Thread David Greene
From: Techlive Zheng Add some tests for various merge operations. Test combinations of merge with --message, --prefix and --squash. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene ---

[PATCH 4/7] contrib/subtree: Add merge tests

2015-11-05 Thread David Greene
From: Techlive Zheng Add some tests for various merge operations. Test combinations of merge with --message, --prefix and --squash. Signed-off-by: Techlive Zheng Signed-off-by: David A. Greene ---