Jump to content

rburgst

Members
  • Content Count

    1
  • Joined

  • Last visited

Community Reputation

1 Neutral

About rburgst

  • Rank
    Newbie
  1. Hi Downloaded the mac version and failed to get it properly working 1. tried the following git config (among a myriad of combinations) [diff] tool = semanticdiff [difftool "semanticdiff"] cmd = \"/Applications/semanticmerge.app/Contents/MacOS/semanticmerge\" -s \"$LOCAL\" -d \"$REMOTE\" [difftool] prompt = false [merge] tool = semanticmerge [mergetool "semanticmerge"] cmd = \"/Applications/semanticmerge.app/Contents/MacOS/semanticmerge\" -b=\"$BASE\" -d=\"$LOCAL\" -s=\"$REMOTE\" -r=\"$MERGED\" -l=csharp -emt=\"mergetool.exe -b=\"\"@basefile\"\" -bn=\"\"@basesymbolic\"\" -s=\
×
×
  • Create New...