summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Thorsten Glaser <t.glaser@tarent.de>2013-08-30 12:40:30 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-30 09:56:30 -0700
commit6897a64b652d83e477389ec1a248b47b8d821db6 (patch)
treebadc1f7e1cd053e0d8d84419e071a81265bf6f18 /mergetools/p4merge
parentMerge branch 'maint-1.8.1' into maint-1.8.2 (diff)
downloadtgif-6897a64b652d83e477389ec1a248b47b8d821db6.tar.xz
fix shell syntax error in template
An if clause must not be empty; add a "colon" command. Signed-off-by: Thorsten Glaser <t.glaser@tarent.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions