# 
# 
# patch "ChangeLog"
#  from [23816ab3fe1a744367ebe0d47e2c05bcb67aef04]
#    to [90dbade8502f1ad2bf11558ca21544be1f74d3cc]
# 
# patch "commands.cc"
#  from [508c6a60662f6bb50c6a5405c545fc7d87851d09]
#    to [fff9418f22489beb99be08c9eaa8aeea48e4d299]
# 
============================================================
--- ChangeLog	23816ab3fe1a744367ebe0d47e2c05bcb67aef04
+++ ChangeLog	90dbade8502f1ad2bf11558ca21544be1f74d3cc
@@ -1,3 +1,8 @@
+2006-02-28  Matt Johnston  <address@hidden>
+
+	* commands.cc (CMD(merge)): don't say "misuse" if it's
+	just already merged.
+
 2006-02-27  Richard Levitte  <address@hidden>
 
 	* po/sv.po: More translations.
============================================================
--- commands.cc	508c6a60662f6bb50c6a5405c545fc7d87851d09
+++ commands.cc	fff9418f22489beb99be08c9eaa8aeea48e4d299
@@ -3119,7 +3119,11 @@
   get_branch_heads(app.branch_name(), app, heads);
 
   N(heads.size() != 0, F("branch '%s' is empty\n") % app.branch_name);
-  N(heads.size() != 1, F("branch '%s' is merged\n") % app.branch_name);
+  if (heads.size() == 1)
+    {
+      P(F("branch '%s' is already merged\n") % app.branch_name);
+      return;
+    }
 
   set<revision_id>::const_iterator i = heads.begin();
   revision_id left = *i;