Mercurial > hg-stable

comparison tests/test-mq-merge.out @ 6336:4b0c9c674707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warn about new heads on commit (issue842)
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 21 Mar 2008 11:06:02 +0100
parents a210b40d0860
children f18f14bae172
comparison
equal deleted inserted replaced
6335:e29557d687c9 6336:4b0c9c674707
1 adding a 1 adding a
2 adding b 2 adding b
3 copy .hg/patches to .hg/patches.1 3 copy .hg/patches to .hg/patches.1
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 M b 5 M b
6 created new head
6 a 7 a
7 b 8 b
8 merging with queue at: .hg/patches.1 9 merging with queue at: .hg/patches.1
9 applying rm_a 10 applying rm_a
10 Now at: rm_a 11 Now at: rm_a