From: Joseph Reagle <joseph.2008@reagle.org>
Date: Mon, 7 Feb 2011 15:58:35 +0000 (-0500)
Subject: update README
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/8393cca00bb5995f8c518633b26e6f7506ec13ba?ds=sidebyside

update 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