Mercurial > hg > pyhgsh
view tests/test-merge-revert.out @ 2261:20cf545b4725
Check existance of sys.argv for the use from mod_python.
author | Shun-ichi GOTO <shunichi.goto@gmail.com> |
---|---|
date | Thu, 11 May 2006 08:48:36 -0700 |
parents | b2ae81a7df29 |
children |
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