Changeset 782 for git/branches/dmik/mergetools/kdiff3

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• mergetools/kdiff3 (modified) (1 diff)

git/branches/dmik/mergetools/kdiff3 ¶

@@ -1 +1 @@
 diff_cmd () {
-        "$merge_tool_path" --auto \
+        "$merge_tool_path" \
                 --L1 "$MERGED (A)" --L2 "$MERGED (B)" \
                 "$LOCAL" "$REMOTE" >/dev/null 2>&1