![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | David Aguilar <davvid@gmail.com> | |
| Thu, 18 Aug 2011 07:23:45 +0000 (00:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Aug 2011 07:09:17 +0000 (00:09 -0700) | ||
| commit | 240dc3e8edb3ae4ee968febc006fa761811c60e6 | |
| tree | 55da09da0cf05747ff9b4909fdba8962c56feed4 | tree | snapshot |
| parent | fdd7aa17f805b376f49a1bf031bf1b88eec89ddf | commit | diff |
mergetool--lib: Make style consistent with git
Use the predominant conditional style where "then" appears
alone on the line after the test expression.
Remove spaces after ">" output redirections.
Remove unnecessary parentheses around the kdiff3 commands.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Use the predominant conditional style where "then" appears
alone on the line after the test expression.
Remove spaces after ">" output redirections.
Remove unnecessary parentheses around the kdiff3 commands.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool--lib.sh | diff | blob | history |