From: David Aguilar <davvid@gmail.com>
Date: Thu, 18 Aug 2011 07:23:45 +0000 (-0700)
Subject: mergetool--lib: Make style consistent with git
X-Git-Tag: v1.7.7-rc0~3^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/240dc3e8edb3ae4ee968febc006fa761811c60e6?ds=inline;hp=240dc3e8edb3ae4ee968febc006fa761811c60e6

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>
---