summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-10-15 08:35:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-15 21:09:15 (GMT)
commit76ee96a9b6f75e7d1c01e68ade72194179aa512d (patch)
tree04dfb82c353a07317258135f109c8a30b2e03809 /git-merge-one-file.sh
parentf9e43085bb95034a36a223f4eba75174b096179c (diff)
downloadgit-76ee96a9b6f75e7d1c01e68ade72194179aa512d.zip
git-76ee96a9b6f75e7d1c01e68ade72194179aa512d.tar.gz
git-76ee96a9b6f75e7d1c01e68ade72194179aa512d.tar.bz2
test-lib-functions: adjust style to match CodingGuidelines
Prefer "test" over "[ ]" for conditionals. Prefer "$()" over backticks for command substitutions. Avoid control structures on a single line with semicolons. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions