diff options
| author |  Techlive Zheng <techlivezheng@gmail.com> | 2015-11-12 20:32:33 -0600 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2015-11-13 00:02:56 -0500 |
| commit | 4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6 (patch) | |
| tree | 87ee90beae8f2f3a721e3e28d0dae6069155941f /Documentation/technical/trivial-merge.txt | |
| parent | contrib/subtree: Add tests for subtree add (diff) | |
| download | tgif-4f96fcc9a2a2d756c5523c49a57f97b53c9cadb6.tar.xz | |
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>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions