view mercurial-tests/testData/README @ 274:5cbb5ae712e9

Add test for TW-17797 * * * update test
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Thu, 28 Jul 2011 16:40:11 +0400
parents
children 8c10f5cec37d
line wrap: on
line source
rep2 history:

@    18:df04faa7575a merge personal-branch tip
|\
| 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 |  14:78e67807f916 change file.txt
| |
| 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 |  9:8c44244d6645 dir5 test
|/
o    8:b6e2d176fe8e merge with conflict
|\
| o  7:d6eaab231902 branch dir4
| |
o |  6:6066b677d026 file41
| |
o |  5:b4937926e2e3 dir4
|/
o    4:6eeb8974fe67 merge
|\
| o  3:2538c02bafeb dir2
| |
| o  2:db8a04d262f3 dir1
| |
o |  1:a3d15477d297 dir3
|/
o    0:e0ad3ddde5aa file.txt