diff options
| author |  David Aguilar <davvid@gmail.com> | 2011-08-18 00:23:45 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-08-19 00:09:17 -0700 |
| commit | 240dc3e8edb3ae4ee968febc006fa761811c60e6 (patch) | |
| tree | 55da09da0cf05747ff9b4909fdba8962c56feed4 /t/t5515/refs.br-branches-one-merge_branches-one | |
| parent | difftool--helper: Make style consistent with git (diff) | |
| download | tgif-240dc3e8edb3ae4ee968febc006fa761811c60e6.tar.xz | |
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>
Diffstat (limited to 't/t5515/refs.br-branches-one-merge_branches-one')
0 files changed, 0 insertions, 0 deletions