aboutsummaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-27 14:37:44 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-27 14:37:44 -0700
commit7f3447cce83ebe80c498a4455c03b0c8f37ac938 (patch)
treebdb5459d6795e2e3c89583e5fbba9223e43a7de0 /t/t7610-mergetool.sh
parent0fb2c97c206958a13e8979187b7b3cc31d389126 (diff)
parent3212d56ce528a86170f7809659f80a8769a5875f (diff)
downloadgit-7f3447cce83ebe80c498a4455c03b0c8f37ac938.tar.gz
git-7f3447cce83ebe80c498a4455c03b0c8f37ac938.tar.xz
Merge branch 'jk/subtree-do-not-push-if-split-fails' into maint
* jk/subtree-do-not-push-if-split-fails: contrib/subtree: don't delete remote branches if split fails
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions