Mercurial > hg
view tests/test-merge-revert.out @ 5855:a6ccb957fd07
Solaris compatibility fixes for test-keyword:
- do not use /bin/false (yields 255 instead of 1)
- do not use "cd -", simply use "cd .." instead.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 14 Jan 2008 09:00:23 +0100 |
parents | d2b55e3c4e25 |
children | 4c94b6d0fb1c |
line wrap: on
line source
1:016807e6fdaf 0:eb43f19ff115 016807e6fdaf tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved eb43f19ff115 eb43f19ff115+ reverting file1 ? file1.orig eb43f19ff115 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved ? file1.orig 016807e6fdaf tip