X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/242b232465a209999450b7dac7539e134ac8135b..refs/heads/master:/README

diff --git a/README b/README
index f0b174e..2cb0e82 100644
--- 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