X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=mergetools%2Fkdiff3;h=a30034f116fda6f90448aeb4ddd42063ea60aad1;hb=98e3d8faf9eebd382f62a75c886b7e1c6a20279b;hp=28fead428b333448566f480a434967fb7325c744;hpb=ee5a57bc5c5641c30bc626892ddc31ddd18ed7ad;p=platform%2Fupstream%2Fgit.git

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
 }