Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
Digitalroot committed Feb 2, 2017
1 parent 1132a8f commit d3f1bc5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# AccuRevMergeWrapper
Wrapper around the AccuRev Merge command

Sometime after AccuRev 4, the "merge -o -K" command was changed to return 1 if there were no files to merge. This causes an error when using nAnt to auto merge files.

This program wraps the "merge -o -K" command, intercepts the output when there are no files to merge, and returns 0 if that is the case. This fixed the way nAnt handled the command.

0 comments on commit d3f1bc5

Please sign in to comment.