Mercurial > hg
view tests/test-mq-merge.out @ 8166:56719b1aa6f4
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 26 Apr 2009 11:49:17 +0200 |
parents | fb32ae9c76e7 |
children | 9a398dd53bcc |
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 (working directory not at tip) applying patcha now at: patcha