Mercurial > hg > mercurial
changeset 308:63a69ed16c88
improve docs
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Wed, 14 Sep 2011 13:46:50 +0400 |
parents | 659287a241c2 |
children | 33305b2022c2 |
files | mercurial-tests/testData/README |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-tests/testData/README Tue Sep 13 13:19:01 2011 +0400 +++ b/mercurial-tests/testData/README Wed Sep 14 13:46:50 2011 +0400 @@ -26,23 +26,23 @@ @ 18:df04faa7575a merge personal-branch tip |\ -| o 17:9ec402c74298 another change to file.txt in personal-branch personal-branch +| o 17:9ec402c74298 another change to file.txt in personal-branch (personal-branch) | | o | 16:505c5b9d01e6 change file.txt back | | -| o 15:96b78d73081d change file.txt in personal-branch personal-branch +| o 15:96b78d73081d change file.txt in personal-branch (personal-branch) | | o | 14:78e67807f916 change file.txt | | -| o 13:dec47d2d49bf create personal branch personal-branch +| o 13:dec47d2d49bf create personal branch (personal-branch) |/ o 12:1e620196c4b6 merge with test branch |\ | o 11:48177654181c dir6 trunk | | -o | 10:fc524efc2bc4 dir6 test +o | 10:fc524efc2bc4 dir6 (test) | | -o | 9:8c44244d6645 dir5 test +o | 9:8c44244d6645 dir5 (test) |/ o 8:b6e2d176fe8e merge with conflict |\