equal
deleted
inserted
replaced
172 $ hg evolve --content-divergent -r ec94a1ed1330 |
172 $ hg evolve --content-divergent -r ec94a1ed1330 |
173 merge:[s5] Added e and f |
173 merge:[s5] Added e and f |
174 with: [s4] Added e and f |
174 with: [s4] Added e and f |
175 base: [3] Added e and f |
175 base: [3] Added e and f |
176 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
176 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
177 working directory is now at 80b2ddbf01d3 |
177 working directory is now at 692bc8b2aa4d |
178 |
178 |
179 $ hg log -r 80b2ddbf01d3 -T '{date|hgdate}\n' |
179 $ hg log -r . -T '{date|hgdate}\n' |
180 0 1 |
180 0 1 |