projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.0.1
[platform/upstream/git.git]
/
mergetools
/
kdiff3
diff --git
a/mergetools/kdiff3
b/mergetools/kdiff3
index
28fead4
..
a30034f
100644
(file)
--- a/
mergetools/kdiff3
+++ b/
mergetools/kdiff3
@@
-1,5
+1,5
@@
diff_cmd () {
diff_cmd () {
- "$merge_tool_path"
--auto
\
+ "$merge_tool_path" \
--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
"$LOCAL" "$REMOTE" >/dev/null 2>&1
}
--L1 "$MERGED (A)" --L2 "$MERGED (B)" \
"$LOCAL" "$REMOTE" >/dev/null 2>&1
}