Mercurial > hg
view tests/test-mq-merge.out @ 7659:25ac72ca68f6
Add Lee Cantey's installer icon to win32 installer
Add Lee Cantey's installer icon to contrib/win32 and update
mercurial.iss accordingly
author | Pascal Quantin <pascal.quantin@wavecom.com> |
---|---|
date | Thu, 15 Jan 2009 14:19:29 +0100 |
parents | f18f14bae172 |
children | fb32ae9c76e7 |
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