diff options
| author |  Thorsten Glaser <t.glaser@tarent.de> | 2013-08-30 12:40:30 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-08-30 09:56:30 -0700 |
| commit | 6897a64b652d83e477389ec1a248b47b8d821db6 (patch) | |
| tree | badc1f7e1cd053e0d8d84419e071a81265bf6f18 /git-merge-octopus.sh | |
| parent | Merge branch 'maint-1.8.1' into maint-1.8.2 (diff) | |
| download | tgif-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 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions