Mercurial > hg
view tests/test-empty-file.out @ 5672:8a65ea986755
Tests for b5605d88dc27 and 840e2b315c1f (interactive prompts during merge)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 27 Dec 2007 13:39:03 +0100 |
parents | 8feb33c2d153 |
children | 4b0c9c674707 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved changeset: 2:62ec0e86d1e5 tag: tip parent: 0:567dde5e6e98 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add empty3 changeset: 1:41ab7b321727 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add empty2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M empty2 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3