--- a/tests/test-commandserver.t Tue Nov 11 20:32:10 2014 -0800
+++ b/tests/test-commandserver.t Thu Nov 27 12:25:01 2014 -0600
@@ -68,7 +68,7 @@
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
- merge merge working directory with another revision
+ merge merge another revision into working directory
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit