equal
deleted
inserted
replaced
1055 >>>>>>> other: 85d2d2d732a5 - test: simplemerge |
1055 >>>>>>> other: 85d2d2d732a5 - test: simplemerge |
1056 |
1056 |
1057 resolve to local |
1057 resolve to local |
1058 |
1058 |
1059 $ HGMERGE=internal:local hg resolve -a |
1059 $ HGMERGE=internal:local hg resolve -a |
1060 no more unresolved files |
1060 (no more unresolved files) |
1061 $ hg commit -m localresolve |
1061 $ hg commit -m localresolve |
1062 $ cat m |
1062 $ cat m |
1063 $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $ |
1063 $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $ |
1064 bar |
1064 bar |
1065 |
1065 |