diff options
author | Tay Ray Chuan <rctay89@gmail.com> | 2010-05-11 01:17:45 +0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-05-10 11:57:31 -0700 |
commit | 5f35afadb032e1d2585f6f0246bf05f2e4e49c27 (patch) | |
tree | 54328782d9b69d7abb3669b02bacd18aaa6f8934 /git-merge-octopus.sh | |
parent | d599e0484f8ebac8cc50e9557a4c3d246826843d (diff) | |
download | git-5f35afadb032e1d2585f6f0246bf05f2e4e49c27.tar.gz |
t7604-merge-custom-message: shift expected output creation
Squash in a minor rename too.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions