* [PATCH v2] mergetools/meld: improve backwards-compatibiilty when using "--output"
@ 2017-06-19 0:20 David Aguilar
0 siblings, 0 replies; only message in thread
From: David Aguilar @ 2017-06-19 0:20 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git Mailing List, Matthew Groth, Samuel Lijin
Meld 3.16.0 requires a "=" in the --output argument, as it uses
a simple hand-rolled command-line parser.
Newer versions of Meld (3.16.4, and possibly earlier) use
optparse, which accepts either "--output <file>" or
"--output=<file>".
Use "--output=<file>" for better compatibility.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
Changes since v1:
Fixed an "optpaarse" -> "optparse" typo in the commit message.
This patch is otherwise identical to v1.
mergetools/meld | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mergetools/meld b/mergetools/meld
index bc178e8882..7a08470f88 100644
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -10,7 +10,7 @@ merge_cmd () {
if test "$meld_has_output_option" = true
then
- "$merge_tool_path" --output "$MERGED" \
+ "$merge_tool_path" --output="$MERGED" \
"$LOCAL" "$BASE" "$REMOTE"
else
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
--
2.13.1.453.gc0395165f3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-06-19 0:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-19 0:20 [PATCH v2] mergetools/meld: improve backwards-compatibiilty when using "--output" David Aguilar
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).