Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert.out @ 2105:21cf3fe64e27
Merge with cmason
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 20 Apr 2006 12:12:03 -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