]> git.ipfire.org Git - thirdparty/git.git/commit - git-mergetool--lib.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fdd7aa1) | patch
mergetool--lib: Make style consistent with git
authorDavid Aguilar <davvid@gmail.com>
Thu, 18 Aug 2011 07:23:45 +0000 (00:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Aug 2011 07:09:17 +0000 (00:09 -0700)
commit240dc3e8edb3ae4ee968febc006fa761811c60e6
tree55da09da0cf05747ff9b4909fdba8962c56feed4tree | snapshot
parentfdd7aa17f805b376f49a1bf031bf1b88eec89ddfcommit | 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>
git-mergetool--lib.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.