diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-09 20:32:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-09 20:32:54 (GMT) |
| commit | b387c77b12953d543bf5efc3825b5be26d753f9c (patch) | |
| tree | 0b79d31d5f8b95c37eb9178152798a2f1aef71f1 /mergetools | |
| parent | faf8fde514df5b5ddd529ec5a89973f1961c5281 (diff) | |
| parent | 92758dd2a2de94c90c0697ef0e8174c3543a47f9 (diff) | |
| download | git-b387c77b12953d543bf5efc3825b5be26d753f9c.zip git-b387c77b12953d543bf5efc3825b5be26d753f9c.tar.gz git-b387c77b12953d543bf5efc3825b5be26d753f9c.tar.bz2 | |
Sync with v1.8.2.3
* maint:
Git 1.8.2.3
t5004: avoid using tar for checking emptiness of archive
t5004: ignore pax global header file
mergetools/kdiff3: do not use --auto when diffing
transport-helper: trivial style cleanup
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/kdiff3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index 28fead4..a30034f 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -1,5 +1,5 @@ diff_cmd () { - "$merge_tool_path" --auto \ + "$merge_tool_path" \ --L1 "$MERGED (A)" --L2 "$MERGED (B)" \ "$LOCAL" "$REMOTE" >/dev/null 2>&1 } |