Results 1 to 2 of 2
  1. #1
    Join Date
    Mar 2013
    Posts
    5

    Default Integration with svn conflict diff (diff-full)

    I've installed the command line tools and followed the instructions for associating Beyond Compare with diff and merge commands as per the documentation for Linux.

    When prompted for conflict resolution, conventional wisdom suggests postponing resolution, then manually diffing / merging file, file.mine, file.rN, file.rN+1. Is it at all possible to hook into subversion's diff-full to pipe the diff to Beyond Compare?

  2. #2
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,366

    Default

    Hello,

    I'm actually not very familiar with the diff-full command line. I did a bit of searching for documentation, but found that it looked like "diff-full" is its own option. Did you define BC3 Pro as both a Diff and Merge tool? And this does not override and be used for the diff-full option?
    Aaron P Scooter Software

Tags for this Thread

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •