| commit | 6779e43b0dbcaeea84319165b1f7c7480e2fe516 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:42 +0000 (3 12:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jun 2014 19:06:43 +0000 (3 12:06 -0700) | ||
| tree | 74597f0b974d1ca0d09da6c64458ff0fbf48b9f0 | treesnapshot (tar.gz zip) |
| parent | 06b2a0f191f7fe8310fc517360f0186098b68cde | commitdiff |
| parent | f3efe78782b36d68dc71a4f48a7bd3381c6b5669 | commitdiff |
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
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
| diff.c | diff1 | diff2 | blobhistory |