{"thread":{"id":"18700","subject":"[PATCH] mergetool-lib: specialize opendiff options when in diff mode","startedAt":"2009-04-03T02:16:11Z","lastAt":"2009-04-03T02:16:11Z","messageCount":1,"participants":["David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"110261","messageId":"1238724971-60979-1-git-send-email-davvid@gmail.com","threadId":"18700","inReplyTo":null,"subject":"[PATCH] mergetool-lib: specialize opendiff options when in diff mode","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-04-03T02:16:11Z","receivedAt":"2009-04-03T02:16:11Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"We don't need the '-merged \"$MERGED\"' option when in diff mode.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n git-mergetool--lib.sh |    8 ++++++--\n 1 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh\nindex 06d261a..b8566b2 100644\n--- a/git-mergetool--lib.sh\n+++ b/git-mergetool--lib.sh\n@@ -189,8 +189,12 @@ run_mergetool () {\n \t\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" \\\n \t\t\t\t-ancestor \"$BASE\" -merge \"$MERGED\" | cat\n \t\telse\n-\t\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" \\\n-\t\t\t\t-merge \"$MERGED\" | cat\n+\t\t\tif merge_mode; then\n+\t\t\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" \\\n+\t\t\t\t\t-merge \"$MERGED\" | cat\n+\t\t\telse\n+\t\t\t\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\" | cat\n+\t\t\tfi\n \t\tfi\n \t\tcheck_unchanged\n \t\t;;\n-- \n1.6.1.3\n"}]}