Permalink
Browse files

mergetool: style fixes

This script is one of the sizeable ones that tempted people to copy
its "neibouring style" in their new code, but was littered with
styles incompatible with our style guide.

 - use one tab, not four spaces, per indent level;

 - long lines can be wrapped after '|', '&&', or '||' for
   readability.

 - structures like "if .. then .. else .. fi", "while .. do .. done"
   are split into lines in such a way that does not require
   unnecessary semicolon.

 - case, esac and case-arms align at the same column.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
1 parent cd7c0be commit f8750a0ea951a328481b67b5d0558c0402f0cdfd Junio C Hamano committed with gitster Aug 23, 2012
Showing with 308 additions and 273 deletions.
  1. +308 −273 git-mergetool.sh
View

0 comments on commit f8750a0

Please sign in to comment.