Rev 2253: (John Arbash Meinel) suggest using 'bzr pull' if merging into a branch with no commits. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2253
revision-id: pqm at pqm.ubuntu.com-20070201213634-0d00da7ab00bf788
parent: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
parent: john at arbash-meinel.com-20070201154007-bnxh3uexaq659ad6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-02-01 21:36:34 +0000
message:
  (John Arbash Meinel) suggest using 'bzr pull' if merging into a branch with no commits.
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070201154007-bnxh3uexaq659ad6
    parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: no-commits-errors
    timestamp: Thu 2007-02-01 09:40:07 -0600
    message:
      Mention using 'bzr pull' if there are no commits in current branch