summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2014-03-21 22:07:20 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-21 15:03:29 -0700
commit02907a08ccfbdf0a9a48259fd7e9a234f3c123b3 (patch)
tree87af1fa57e59759ef15d3960051a0f73cd8cb8d7 /git-merge-octopus.sh
parentt4018: reduce test files for pattern compilation tests (diff)
downloadtgif-02907a08ccfbdf0a9a48259fd7e9a234f3c123b3.tar.xz
t4018: test cases for the built-in cpp pattern
A later patch changes the built-in cpp pattern. These test cases demonstrate aspects of the pattern that we do not want to change. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions