Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert.out @ 1612:0d36e3d7e2ea
Adjusted test output to match new hgignore error messages.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 07 Jan 2006 16:34:20 +0100 |
parents | 5a034646e472 |
children | 7544700fd931 |
line wrap: on
line source
1:3aa14bbc23d9 0:8633637036c1 3aa14bbc23d9 tip 8633637036c1 8633637036c1+ 8633637036c1 3aa14bbc23d9 tip merging file1 3aa14bbc23d9 tip 3aa14bbc23d9 tip 3aa14bbc23d9 tip 3aa14bbc23d9 tip