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