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