Mercurial > hg
view tests/test-merge4.out @ 9403:3738c8cff1bf
test-keyword: update output to match 5d49fdef6fd0
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 27 Aug 2009 00:00:15 +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)