equal
deleted
inserted
replaced
404 parent: 1:bf1602f437f3 |
404 parent: 1:bf1602f437f3 |
405 file1 |
405 file1 |
406 branch: branch1 |
406 branch: branch1 |
407 commit: (clean) |
407 commit: (clean) |
408 update: (current) |
408 update: (current) |
|
409 |
|
410 $ cd .. |
|
411 |
|
412 backout of empty changeset (issue4190) |
|
413 |
|
414 $ hg init emptycommit |
|
415 $ cd emptycommit |
|
416 |
|
417 $ touch file1 |
|
418 $ hg ci -Aqm file1 |
|
419 $ hg branch -q branch1 |
|
420 $ hg ci -qm branch1 |
|
421 $ hg backout -v 1 |
|
422 resolving manifests |
|
423 nothing changed |
|
424 [1] |
409 |
425 |
410 $ cd .. |
426 $ cd .. |
411 |
427 |
412 |
428 |
413 Test usage of `hg resolve` in case of conflict |
429 Test usage of `hg resolve` in case of conflict |