changeset 17345 | 4f8054d3171b |
parent 17099 | 1c55d1add24f |
child 17424 | e7cfe3587ea4 |
child 17485 | dc0d61216672 |
17344:539d948d8d4b | 17345:4f8054d3171b |
---|---|
996 |
996 |
997 Prepare merge and resolve tests |
997 Prepare merge and resolve tests |
998 |
998 |
999 $ echo '$Id$' > m |
999 $ echo '$Id$' > m |
1000 $ hg add m |
1000 $ hg add m |
1001 $ hg commit -m 4kw |
1001 $ hg commit -m 4kw |
1002 $ echo foo >> m |
1002 $ echo foo >> m |
1003 $ hg commit -m 5foo |
1003 $ hg commit -m 5foo |
1004 |
1004 |
1005 simplemerge |
1005 simplemerge |
1006 |
1006 |