Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-10-05 14:37:31 +03:00
Code Issues Projects Releases Wiki Activity

Add Beyond Compare 4 to mergetools

Browse Source 
BC4 executable: 'bcompare' (Linux), 'BCompare.exe' (Windows)
This commit is contained in:
Stefan Knotzer 2020-06-20 17:41:05 +02:00
parent 45d5c1debc
commit c91e091a11
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/mergetools
View File

@ -10,6 +10,12 @@
[mergetool "bc"]
cmd = bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" -mergeoutput=\"$MERGED\"
[difftool "bc4"]
cmd = bcompare \"$LOCAL\" \"$REMOTE\"
[mergetool "bc4"]
cmd = bcompare \"$LOCAL\" \"$REMOTE\" \"$BASE\" -mergeoutput=\"$MERGED\"
[difftool "codecompare"]
cmd = CodeCompare \"$LOCAL\" \"$REMOTE\"