summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-22 08:41:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-22 08:41:31 -0700
commit141ff8f9e7a235ab279329ba348e3d88fca4fdab (patch)
treec9c3671bb4ca25e2f5a2f2a720d39460744d830a /git-merge-octopus.sh
parentrebase -i: fix post-rewrite hook with failed exec command (diff)
downloadtgif-141ff8f9e7a235ab279329ba348e3d88fca4fdab.tar.xz
t5407: use <<- to align the expected output
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions