diff options
| author |  Techlive Zheng <techlivezheng@gmail.com> | 2015-11-12 20:32:31 -0600 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2015-11-13 00:02:56 -0500 |
| commit | a686701184bc9e3d54b2870455f3ff276360299e (patch) | |
| tree | 81eed79cfd79b289b473198a9862185da27df997 /contrib/examples/git-merge-ours.sh | |
| parent | contrib/subtree: Clean and refactor test code (diff) | |
| download | tgif-a686701184bc9e3d54b2870455f3ff276360299e.tar.xz | |
contrib/subtree: Add test for missing subtree
Test that a merge from a non-existant subtree fails.
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 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions