{"thread":{"id":"46204","subject":"[PATCH v2] mergetools/meld: improve backwards-compatibiilty when using \"--output\"","startedAt":"2017-06-19T00:20:37Z","lastAt":"2017-06-19T00:20:37Z","messageCount":1,"participants":["David Aguilar"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"322535","messageId":"20170619002027.27346-1-davvid@gmail.com","threadId":"46204","inReplyTo":null,"subject":"[PATCH v2] mergetools/meld: improve backwards-compatibiilty when using \"--output\"","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2017-06-19T00:20:27Z","receivedAt":"2017-06-19T00:20:37Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Meld 3.16.0 requires a \"=\" in the --output argument, as it uses\na simple hand-rolled command-line parser.\n\nNewer versions of Meld (3.16.4, and possibly earlier) use\noptparse, which accepts either \"--output <file>\" or\n\"--output=<file>\".\n\nUse \"--output=<file>\" for better compatibility.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\nChanges since v1:\n\nFixed an \"optpaarse\" -> \"optparse\" typo in the commit message.\nThis patch is otherwise identical to v1.\n\n mergetools/meld | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/mergetools/meld b/mergetools/meld\nindex bc178e8882..7a08470f88 100644\n--- a/mergetools/meld\n+++ b/mergetools/meld\n@@ -10,7 +10,7 @@ merge_cmd () {\n \n \tif test \"$meld_has_output_option\" = true\n \tthen\n-\t\t\"$merge_tool_path\" --output \"$MERGED\" \\\n+\t\t\"$merge_tool_path\" --output=\"$MERGED\" \\\n \t\t\t\"$LOCAL\" \"$BASE\" \"$REMOTE\"\n \telse\n \t\t\"$merge_tool_path\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"\n-- \n2.13.1.453.gc0395165f3\n\n"}]}