Mercurial > hg
view tests/test-merge-revert.out @ 2654:c54ecfc360a9
util.getuser: raise exception if win32api not available.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 24 Jul 2006 09:19:25 -0700 |
parents | b2ae81a7df29 |
children | 966632304dde |
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 merging file1 0 files updated, 1 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