# # # patch "ChangeLog" # from [4145002dedd0b134adf5d79d8e04827c44dc2c0a] # to [327e0cd279b8a3c483fcc769383b514e2c704a48] # # patch "commands.cc" # from [6ad33bd7164ad08401f8c6d5bdc2cc67303e095d] # to [2f8e7bd065fc48fc423fc2070e971628b1da7275] # ============================================================ --- ChangeLog 4145002dedd0b134adf5d79d8e04827c44dc2c0a +++ ChangeLog 327e0cd279b8a3c483fcc769383b514e2c704a48 @@ -1,5 +1,10 @@ 2006-03-03 Nathaniel Smith + * commands.cc (checkout): Oops, missed a format string + argument... + +2006-03-03 Nathaniel Smith + * std_hooks.lua (merge3_xxdiff_cmd): Pass --exit-with-merge-status so as to get a meaningful exit code. ============================================================ --- commands.cc 6ad33bd7164ad08401f8c6d5bdc2cc67303e095d +++ commands.cc 2f8e7bd065fc48fc423fc2070e971628b1da7275 @@ -1489,7 +1489,7 @@ N(heads.size() > 0, F("branch '%s' is empty") % app.branch_name); if (heads.size() > 1) { - P(F("branch %s has multiple heads:")); + P(F("branch %s has multiple heads:") % app.branch_name); for (set::const_iterator i = heads.begin(); i != heads.end(); ++i) P(i18n_format(" %s\n") % describe_revision(app, *i)); P(F("choose one with '%s checkout -r'") % app.prog_name);