Mercurial > hg > pyhgsh
view tests/test-merge-revert.out @ 2052:c0b945c5df08
Added tag 0.8.1 for changeset 6a03cff2b0f5d30281e6addefe96b993582f2eac
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 07 Apr 2006 20:08:11 -0500 |
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