update README

diff --git a/README b/README
index f0b174e0a8a0559f253b448fcfe7e169cc72b1e7..2cb0e8210c242dd9ce93e74faed6e69b1461d9c7 100644 (file)
--- a/README
+++ b/README
@@ -25,6 +25,7 @@ usage: mw [subcommand]
         init           start a mw repo          
         login          authenticate with wiki   
         logout         forget authentication    
+        merge          run merge tool on conflicting locate/remove diffs
         pull           add remote pages to repo 
         pullcat        add remote pages to repo belonging to the given category
         status (st)    check repo status