Mercurial > hg
view tests/test-mq-merge.out @ 9450:e78967d3dd6f
commands: forbid 'hg update --check --clean'
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 17 Sep 2009 21:34:05 +0200 |
parents | 9a398dd53bcc |
children | 561ff8d9e4f0 |
line wrap: on
line source
adding a adding b copy .hg/patches to .hg/patches.1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved M b created new head a b merging with queue at: .hg/patches.1 applying rm_a now at: rm_a b patch queue now empty % init t2 adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create the reference queue 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % merge merging with queue at refqueue applying patcha now at: patcha