tests/test-mq-merge.out
author Matt Mackall <mpm@selenic.com>
Mon, 31 Mar 2008 21:49:33 -0500
changeset 6434 62e0bb41e682
parent 6336 4b0c9c674707
child 6628 f18f14bae172
permissions -rw-r--r--
hgweb: minor improvements for new web style - make renamelink take a context - pass current node to shortlog page rather than tip - pass user/desc/date/rename to filediff - improve template error reporting for foo%bar

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