Jump to content

msloan7

Members
  • Content Count

    1
  • Joined

  • Last visited

  • Days Won

    1

msloan7 last won the day on October 29 2013

msloan7 had the most liked content!

Community Reputation

4 Neutral

About msloan7

  • Rank
    Newbie
  1. After following the instructions to configure semantic merge as the difftool, I get an error of that looks like the following when right-clicking a shelved files and clicking "Diff against source revision": Could not find file '{path}\SomeCSharpFile@' Looking at the log in Perforce I see the following command: p4 diff2 {path}/SomeCSharpFile.cs#65 {path}/SomeCSharpFile.cs@=418368 It appears that SemanticMerge is not handling the @=4183868 revision symbol at the end of the second file. Diffing unshelved files works fine for me.
×
×
  • Create New...