Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert.out @ 2166:d0c02b4dce9a
do not check sys.argv from localrepo when running hooks.
instead add traceback field to ui class.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 30 Apr 2006 16:30:39 -0700 |
parents | c9226bcc288d |
children | b2ae81a7df29 |
line wrap: on
line source
1:016807e6fdaf 0:eb43f19ff115 016807e6fdaf tip eb43f19ff115 eb43f19ff115+ reverting file1 ? file1.orig eb43f19ff115 ? file1.orig 016807e6fdaf tip merging file1 ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip