Tuesday, October 9, 2012

SmartSVN External Conflict Solver Arguments

KDiff3

${leftFile} ${baseFile} ${rightFile} -o ${mergedFile}
Posted by Duncan Sung W. Kim at 9:33 PM
Labels:

1 comment:

  1. CliveJuly 13, 2014 at 1:37 AM

    The above is incorrect. It should be:
    ${baseFile} ${leftFile} ${rightFile} -o ${mergedFile}
    To confirm see kdiff3 -h

    ReplyDelete

Subscribe to: Post Comments (Atom)