Rev 1930: Document merge --uncommitted in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1930
revision-id: pqm at pqm.ubuntu.com-20060816143120-21f567e8e50d2414
parent: pqm at pqm.ubuntu.com-20060816142451-0c165573fe342dd5
parent: abentley at panoramicfeedback.com-20060816142310-3d1a27e64f7b8b38
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-08-16 15:31:20 +0100
message:
  Document merge --uncommitted
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  doc/tutorial.txt               tutorial.txt-20050804190939-9dcbba2ef053bc84
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060816142310-3d1a27e64f7b8b38
    parent: abentley at panoramicfeedback.com-20060816135449-7e54c450c841ba44
    parent: pqm at pqm.ubuntu.com-20060816043116-0e82b6cea99bffd4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: merge-uncommitted
    timestamp: Wed 2006-08-16 10:23:10 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060816135449-7e54c450c841ba44
    parent: abentley at panoramicfeedback.com-20060814130806-6620da943f6d9778
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: merge-uncommitted
    timestamp: Wed 2006-08-16 09:54:49 -0400
    message:
      Update NEWS and tutorial to describe merge --uncommitted
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060814130806-6620da943f6d9778
    parent: abentley at panoramicfeedback.com-20060809164210-3945898670a299ca
    parent: pqm at pqm.ubuntu.com-20060814042957-3fa43995db57512a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: merge-uncommitted
    timestamp: Mon 2006-08-14 09:08:06 -0400
    message:
      Merge bzr.dev