Merge branch 'master' of https://github.com/Digitalroot/AccuRevMergeW…

…rapper
Digitalroot-Technologies · Feb 2, 2017 · e38bbc6 · e38bbc6
2 parents 3f517d2 + d3f1bc5
commit e38bbc6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -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.