@@ -65,7 +65,7 @@ static ExternalMerger()
65
65
new ExternalMerger ( 2 , "vscode_insiders" , "Visual Studio Code - Insiders" , "/usr/share/code-insiders/code-insiders" , "-n --wait \" $MERGED\" " , "-n --wait --diff \" $LOCAL\" \" $REMOTE\" " ) ,
66
66
new ExternalMerger ( 3 , "kdiff3" , "KDiff3" , "/usr/bin/kdiff3" , "\" $REMOTE\" -b \" $BASE\" \" $LOCAL\" -o \" $MERGED\" " , "\" $LOCAL\" \" $REMOTE\" " ) ,
67
67
new ExternalMerger ( 4 , "beyond_compare" , "Beyond Compare" , "/usr/bin/bcomp" , "\" $REMOTE\" \" $LOCAL\" \" $BASE\" \" $MERGED\" " , "\" $LOCAL\" \" $REMOTE\" " ) ,
68
- new ExternalMerger ( 5 , "meld" , "Meld" , "/usr/bin/meld" , "\" $LOCAL\" \" $BASE\" \" $REMOTE\" -output \" $MERGED\" " , "\" $LOCAL\" \" $REMOTE\" " ) ,
68
+ new ExternalMerger ( 5 , "meld" , "Meld" , "/usr/bin/meld" , "\" $LOCAL\" \" $BASE\" \" $REMOTE\" -- output \" $MERGED\" " , "\" $LOCAL\" \" $REMOTE\" " ) ,
69
69
new ExternalMerger ( 6 , "codium" , "VSCodium" , "/usr/share/codium/bin/codium" , "-n --wait \" $MERGED\" " , "-n --wait --diff \" $LOCAL\" \" $REMOTE\" " ) ,
70
70
new ExternalMerger ( 7 , "p4merge" , "P4Merge" , "/usr/local/bin/p4merge" , "-tw 4 \" $BASE\" \" $LOCAL\" \" $REMOTE\" \" $MERGED\" " , "-tw 4 \" $LOCAL\" \" $REMOTE\" " ) ,
71
71
} ;
0 commit comments