How to set Araxis as diff / merge tool for MSYS git?

前端 未结 8 1895
情书的邮戳
情书的邮戳 2020-12-05 08:10

I\'m trying to use Araxis Merge as my diff / merge tool for MSYSGit.

I found a few resources on the net:

  • On the Araxis site, they mention an "easy&q
相关标签:
8条回答
  • 2020-12-05 09:04

    You could try to follow the script mentioned in my answer about diffMerge (for Windows) and see if it works.

    The executable path could be better expressed with:

    #!/bin/sh
    
    "C:/Program Files/Araxis/Araxis Merge/compare.exe" -title1:"$1 (repo version)" -title2:"$1 " -max "$2" "$5"
    
    0 讨论(0)
  • 2020-12-05 09:04

    One way I found to do it "simply" is to install TortoiseGit and set the diff / merge tools in TortoiseGit options.
    However, this does not address the issue if you want to diff from the command line.

    0 讨论(0)
提交回复
热议问题