equal
deleted
inserted
replaced
269 o 1:de6151c48e1c public fix bug 37 |
269 o 1:de6151c48e1c public fix bug 37 |
270 | |
270 | |
271 o 0:0dc9c9f6ab91 public create new project |
271 o 0:0dc9c9f6ab91 public create new project |
272 |
272 |
273 Merge the trouble away. |
273 Merge the trouble away. |
274 $ HGMERGE=internal:local hg merge |
274 $ hg merge --tool internal:local |
275 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
275 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
276 (branch merge, don't forget to commit) |
276 (branch merge, don't forget to commit) |
277 $ hg commit -m merge |
277 $ hg commit -m merge |
278 $ hg shortlog -G |
278 $ hg shortlog -G |
279 @ 7:b1d30ba26e44 draft merge |
279 @ 7:b1d30ba26e44 draft merge |
292 5:fc16901f4d7a |
292 5:fc16901f4d7a |
293 6:694fd0f6b503 |
293 6:694fd0f6b503 |
294 |
294 |
295 # XXX hg evolve does not solve this trouble! bug in evolve? |
295 # XXX hg evolve does not solve this trouble! bug in evolve? |
296 #Evolve the trouble away. |
296 #Evolve the trouble away. |
297 # $ HGMERGE=internal:local hg evolve --all |
297 # $ hg evolve --all --tool=internal:local |
298 # merge:[5] fix bug 24 (v2 by bob) |
298 # merge:[5] fix bug 24 (v2 by bob) |
299 # with: [6] fix bug 24 (v2 by alice) |
299 # with: [6] fix bug 24 (v2 by alice) |
300 # base: [3] fix bug 24 (v1) |
300 # base: [3] fix bug 24 (v1) |
301 # 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
301 # 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
302 # $ hg status |
302 # $ hg status |