#
# patch "ChangeLog"
#  from [62f84027102e0ef51d71f5d62d5c58ae6e2eafa8]
#    to [70c98ce4850f58f54ada25e88a0da7a029af3ef2]
#
# patch "commands.cc"
#  from [d0e6c37bc5f87889652c17c99c1c78ebd3104195]
#    to [2bbd1a33377ead4b9b09bcdbe5d8eddbe3d2a891]
#
========================================================================
--- ChangeLog	62f84027102e0ef51d71f5d62d5c58ae6e2eafa8
+++ ChangeLog	70c98ce4850f58f54ada25e88a0da7a029af3ef2
@@ -1,3 +1,7 @@
+2005-10-24  Benoît Dejean  <address@hidden>
+
+	* commands.cc: Merged 2 i18n strings.
+
 2005-10-23  Timothy Brownawell  <address@hidden>

 	* std_hooks.lua: new default get_netsync_*_permitted hooks, which
========================================================================
--- commands.cc	d0e6c37bc5f87889652c17c99c1c78ebd3104195
+++ commands.cc	2bbd1a33377ead4b9b09bcdbe5d8eddbe3d2a891
@@ -1434,7 +1434,7 @@
       N(!app.branch_name().empty(), F("need --branch argument for branch-based checkout"));
       set<revision_id> heads;
       get_branch_heads(app.branch_name(), app, heads);
-      N(heads.size() > 0, F("branch %s is empty") % app.branch_name);
+      N(heads.size() > 0, F("branch '%s' is empty\n") % app.branch_name);
       N(heads.size() == 1, F("branch %s has multiple heads") % app.branch_name);
       ident = *(heads.begin());
     }