summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-29 22:28:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-29 22:28:05 -0700
commitf5fd2a7d179a8bb843ec44d2a594e6ccf50dfb3a (patch)
tree212e3cc2b4d1f342b236af4f5827e066fc5e3ef3 /t/t7605-merge-resolve.sh
parentMerge branch 'rr/test-use-shell-path-not-shell' (diff)
parentrebase -i: fix misleading error message after 'exec no-such' instruction (diff)
downloadtgif-f5fd2a7d179a8bb843ec44d2a594e6ccf50dfb3a.tar.xz
Merge branch 'js/rebase-exec-command-not-found'
* js/rebase-exec-command-not-found: rebase -i: fix misleading error message after 'exec no-such' instruction
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions