Mercurial > hg
view tests/test-mq-merge.out @ 10039:1d69de7c91d2
i18n-el: translate the rest of hgext/bookmarks
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Sat, 05 Dec 2009 05:21:33 +0200 |
parents | 561ff8d9e4f0 |
children | 7637fe4f525d |
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 popping rm_a popping .hg.patches.merge.marker 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 applying patcha now at: patcha