summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-03 19:06:43 (GMT)
commit6779e43b0dbcaeea84319165b1f7c7480e2fe516 (patch)
tree74597f0b974d1ca0d09da6c64458ff0fbf48b9f0 /builtin/merge.c
parent06b2a0f191f7fe8310fc517360f0186098b68cde (diff)
parentf3efe78782b36d68dc71a4f48a7bd3381c6b5669 (diff)
downloadgit-6779e43b0dbcaeea84319165b1f7c7480e2fe516.zip
git-6779e43b0dbcaeea84319165b1f7c7480e2fe516.tar.gz
git-6779e43b0dbcaeea84319165b1f7c7480e2fe516.tar.bz2
Merge branch 'jk/external-diff-use-argv-array'
Code clean-up (and a bugfix which has been merged for 2.0). * jk/external-diff-use-argv-array: run_external_diff: refactor cmdline setup logic run_external_diff: hoist common bits out of conditional run_external_diff: drop fflush(NULL) run_external_diff: clean up error handling run_external_diff: use an argv_array for the environment
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions