From: Techlive Zheng <techlivezheng@gmail.com>
Date: Fri, 13 Nov 2015 02:32:33 +0000 (-0600)
Subject: contrib/subtree: Add merge tests
X-Git-Tag: v2.7.0-rc0~25^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6?hp=4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6

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>
---