Google Git
Sign in
googlers / jrn / git / 240dc3e8edb3ae4ee968febc006fa761811c60e6
commit240dc3e8edb3ae4ee968febc006fa761811c60e6[log] [tgz]
authorDavid Aguilar <davvid@gmail.com>Thu Aug 18 00:23:45 2011 -0700
committerJunio C Hamano <gitster@pobox.com>Fri Aug 19 00:09:17 2011 -0700
tree55da09da0cf05747ff9b4909fdba8962c56feed4
parentfdd7aa17f805b376f49a1bf031bf1b88eec89ddf [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>
1 file changed
tree: 55da09da0cf05747ff9b4909fdba8962c56feed4
  1. block-sha1/
  2. builtin/
  3. compat/
  4. contrib/
  5. Documentation/
  6. git-gui/
  7. git_remote_helpers/
  8. gitk-git/
  9. gitweb/
  10. perl/
  11. po/
  12. ppc/
  13. t/
  14. templates/
  15. vcs-svn/
  16. xdiff/
  17. RelNotes ⇨ Documentation/RelNotes/1.7.7.txt
  18. .gitattributes
  19. .gitignore
  20. .mailmap
  21. abspath.c
  22. aclocal.m4
  23. advice.c
  24. advice.h
  25. alias.c
  26. alloc.c
  27. archive-tar.c
  28. archive-zip.c
  29. archive.c
  30. archive.h
  31. attr.c
  32. attr.h
  33. base85.c
  34. bisect.c
  35. bisect.h
  36. blob.c
  37. blob.h
  38. branch.c
  39. branch.h
  40. builtin.h
  41. bundle.c
  42. bundle.h
  43. cache-tree.c
  44. cache-tree.h
  45. cache.h
  46. check-builtins.sh
  47. check-racy.c
  48. check_bindir
  49. color.c
  50. color.h
  51. combine-diff.c
  52. command-list.txt
  53. commit.c
  54. commit.h
  55. config.c
  56. config.mak.in
  57. configure.ac
  58. connect.c
  59. convert.c
  60. convert.h
  61. copy.c
  62. COPYING
  63. csum-file.c
  64. csum-file.h
  65. ctype.c
  66. daemon.c
  67. date.c
  68. decorate.c
  69. decorate.h
  70. delta.h
  71. diff-delta.c
  72. diff-lib.c
  73. diff-no-index.c
  74. diff.c
  75. diff.h
  76. diffcore-break.c
  77. diffcore-delta.c
  78. diffcore-order.c
  79. diffcore-pickaxe.c
  80. diffcore-rename.c
  81. diffcore.h
  82. dir.c
  83. dir.h
  84. editor.c
  85. entry.c
  86. environment.c
  87. exec_cmd.c
  88. exec_cmd.h
  89. fast-import.c
  90. fetch-pack.h
  91. fixup-builtins
  92. fsck.c
  93. fsck.h
  94. generate-cmdlist.sh
  95. gettext.c
  96. gettext.h
  97. git-add--interactive.perl
  98. git-am.sh
  99. git-archimport.perl
  100. git-bisect.sh
  101. git-compat-util.h
  102. git-cvsexportcommit.perl
  103. git-cvsimport.perl
  104. git-cvsserver.perl
  105. git-difftool--helper.sh
  106. git-difftool.perl
  107. git-filter-branch.sh
  108. git-instaweb.sh
  109. git-lost-found.sh
  110. git-merge-octopus.sh
  111. git-merge-one-file.sh
  112. git-merge-resolve.sh
  113. git-mergetool--lib.sh
  114. git-mergetool.sh
  115. git-parse-remote.sh
  116. git-pull.sh
  117. git-quiltimport.sh
  118. git-rebase--am.sh
  119. git-rebase--interactive.sh
  120. git-rebase--merge.sh
  121. git-rebase.sh
  122. git-relink.perl
  123. git-remote-testgit.py
  124. git-repack.sh
  125. git-request-pull.sh
  126. git-send-email.perl
  127. git-sh-i18n.sh
  128. git-sh-setup.sh
  129. git-stash.sh
  130. git-submodule.sh
  131. git-svn.perl
  132. GIT-VERSION-GEN
  133. git-web--browse.sh
  134. git.c
  135. git.spec.in
  136. graph.c
  137. graph.h
  138. grep.c
  139. grep.h
  140. hash.c
  141. hash.h
  142. help.c
  143. help.h
  144. hex.c
  145. http-backend.c
  146. http-fetch.c
  147. http-push.c
  148. http-walker.c
  149. http.c
  150. http.h
  151. ident.c
  152. imap-send.c
  153. INSTALL
  154. levenshtein.c
  155. levenshtein.h
  156. LGPL-2.1
  157. list-objects.c
  158. list-objects.h
  159. ll-merge.c
  160. ll-merge.h
  161. lockfile.c
  162. log-tree.c
  163. log-tree.h
  164. mailmap.c
  165. mailmap.h
  166. Makefile
  167. match-trees.c
  168. merge-file.c
  169. merge-file.h
  170. merge-recursive.c
  171. merge-recursive.h
  172. name-hash.c
  173. notes-cache.c
  174. notes-cache.h
  175. notes-merge.c
  176. notes-merge.h
  177. notes.c
  178. notes.h
  179. object.c
  180. object.h
  181. pack-check.c
  182. pack-refs.c
  183. pack-refs.h
  184. pack-revindex.c
  185. pack-revindex.h
  186. pack-write.c
  187. pack.h
  188. pager.c
  189. parse-options.c
  190. parse-options.h
  191. patch-delta.c
  192. patch-ids.c
  193. patch-ids.h
  194. path.c
  195. pkt-line.c
  196. pkt-line.h
  197. preload-index.c
  198. pretty.c
  199. progress.c
  200. progress.h
  201. quote.c
  202. quote.h
  203. reachable.c
  204. reachable.h
  205. read-cache.c
  206. README
  207. reflog-walk.c
  208. reflog-walk.h
  209. refs.c
  210. refs.h
  211. remote-curl.c
  212. remote.c
  213. remote.h
  214. replace_object.c
  215. rerere.c
  216. rerere.h
  217. resolve-undo.c
  218. resolve-undo.h
  219. revision.c
  220. revision.h
  221. run-command.c
  222. run-command.h
  223. send-pack.h
  224. server-info.c
  225. setup.c
  226. sh-i18n--envsubst.c
  227. sha1-array.c
  228. sha1-array.h
  229. sha1-lookup.c
  230. sha1-lookup.h
  231. sha1_file.c
  232. sha1_name.c
  233. shallow.c
  234. shell.c
  235. shortlog.h
  236. show-index.c
  237. sideband.c
  238. sideband.h
  239. sigchain.c
  240. sigchain.h
  241. strbuf.c
  242. strbuf.h
  243. streaming.c
  244. streaming.h
  245. string-list.c
  246. string-list.h
  247. submodule.c
  248. submodule.h
  249. symlinks.c
  250. tag.c
  251. tag.h
  252. tar.h
  253. test-chmtime.c
  254. test-ctype.c
  255. test-date.c
  256. test-delta.c
  257. test-dump-cache-tree.c
  258. test-genrandom.c
  259. test-index-version.c
  260. test-line-buffer.c
  261. test-match-trees.c
  262. test-mktemp.c
  263. test-obj-pool.c
  264. test-parse-options.c
  265. test-path-utils.c
  266. test-run-command.c
  267. test-sha1.c
  268. test-sha1.sh
  269. test-sigchain.c
  270. test-string-pool.c
  271. test-subprocess.c
  272. test-svn-fe.c
  273. test-treap.c
  274. thread-utils.c
  275. thread-utils.h
  276. trace.c
  277. transport-helper.c
  278. transport.c
  279. transport.h
  280. tree-diff.c
  281. tree-walk.c
  282. tree-walk.h
  283. tree.c
  284. tree.h
  285. unimplemented.sh
  286. unpack-trees.c
  287. unpack-trees.h
  288. upload-pack.c
  289. url.c
  290. url.h
  291. usage.c
  292. userdiff.c
  293. userdiff.h
  294. utf8.c
  295. utf8.h
  296. walker.c
  297. walker.h
  298. wrap-for-bin.sh
  299. wrapper.c
  300. write_or_die.c
  301. ws.c
  302. wt-status.c
  303. wt-status.h
  304. xdiff-interface.c
  305. xdiff-interface.h
  306. zlib.c