| branch | stable |
| changeset 1119 | 5f7f30917a18 |
| parent 1117 | 8d5052f23e99 |
| child 1121 | f4dcce73f362 |
| 1117:8d5052f23e99 | 1119:5f7f30917a18 |
|---|---|
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 |