aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2007-09-28 22:26:05 -0400
committerTheodore Ts'o <tytso@mit.edu>2007-09-28 22:26:05 -0400
commit208fe3ac7e1fd5be173cae1db4fa776390bc4e7d (patch)
tree8ceb7673b3fa9a9a1fac4ea1276ebbfc709932dc /git-mergetool.sh
parentf6e0e559340af6e300b63da061fa05ff07e3d6f6 (diff)
downloadgit-208fe3ac7e1fd5be173cae1db4fa776390bc4e7d.tar.gz
git-208fe3ac7e1fd5be173cae1db4fa776390bc4e7d.tar.xz
mergetool: Fix typo in options passed to kdiff3
Fix missing double hyphens in "-L1" and "-L2" Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'git-mergetool.sh')
-rwxr-xr-xgit-mergetool.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh
index a92019a1e..9f4f3134b 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -192,10 +192,10 @@ merge_file () {
case "$merge_tool" in
kdiff3)
if base_present ; then
- (kdiff3 --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path (Remote)" \
+ (kdiff3 --auto --L1 "$path (Base)" --L2 "$path (Local)" --L3 "$path (Remote)" \
-o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1)
else
- (kdiff3 --auto -L1 "$path (Local)" --L2 "$path (Remote)" \
+ (kdiff3 --auto --L1 "$path (Local)" --L2 "$path (Remote)" \
-o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1)
fi
status=$?