Mercurial > hg
view tests/test-mq-merge.out @ 6061:de08788511d7
test-keyword: make it run under Windows
- don't cat symlink, content differs
- rewrite OS specific messages
- generate symlink with a bundle
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 09 Feb 2008 20:17:09 +0100 |
| parents | a210b40d0860 |
| children | 4b0c9c674707 |
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 a b merging with queue at: .hg/patches.1 applying rm_a Now at: rm_a b Patch queue now empty