hgbook

diff en/examples/mq.tutorial.qnew.out @ 156:91a936be78b8

Document merge behaviour with file names.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 12 23:11:26 2007 -0700 (2007-03-12)
parents
children 00f69e8825c5
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/mq.tutorial.qnew.out	Mon Mar 12 23:11:26 2007 -0700
     1.3 @@ -0,0 +1,20 @@
     1.4 +$ \textbf{hg tip}
     1.5 +changeset:   
     1.6 +tag:         tip
     1.7 +user:        Bryan O'Sullivan <bos@serpentine.com>
     1.8 +
     1.9 +summary:     first change
    1.10 +
    1.11 +$ \textbf{hg qnew first.patch}
    1.12 +$ \textbf{hg tip}
    1.13 +changeset:   
    1.14 +tag:         qtip
    1.15 +tag:         first.patch
    1.16 +tag:         tip
    1.17 +tag:         qbase
    1.18 +user:        Bryan O'Sullivan <bos@serpentine.com>
    1.19 +
    1.20 +summary:     New patch: first.patch
    1.21 +
    1.22 +$ \textbf{ls .hg/patches}
    1.23 +first.patch  series  status