Mercurial > hg
view tests/test-merge4.out @ 9453:de414835d140
merge with mpm (temporarily undo qprev/qnext/qtop removal)
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Tue, 15 Sep 2009 18:26:05 +0200 |
parents | 4b0c9c674707 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)