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>
Theodore Ts'o committed
Sep 28, 2007 at 22:26 UTC
208fe3ac7e1fd5be173cae1db4fa776390bc4e7d
1 file changed
+2
-2
git-mergetool.sh
+2
-2
@@ -192,10 +192,10 @@ merge_file () {
192
case "$merge_tool" in
193
kdiff3)
194
if base_present ; then
195
- (kdiff3 --auto --L1 "$path (Base)" -L2 "$path (Local)" --L3 "$path (Remote)" \
195
+ (kdiff3 --auto --L1 "$path (Base)" --L2 "$path (Local)" --L3 "$path (Remote)" \
196
-o "$path" -- "$BASE" "$LOCAL" "$REMOTE" > /dev/null 2>&1)
197
else
198
- (kdiff3 --auto -L1 "$path (Local)" --L2 "$path (Remote)" \
198
+ (kdiff3 --auto --L1 "$path (Local)" --L2 "$path (Remote)" \
199
-o "$path" -- "$LOCAL" "$REMOTE" > /dev/null 2>&1)
200
fi
201
status=$?