Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 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 | 696851b1bba9 |
| children | 64a1169c927d |
comparison
equal
deleted
inserted
replaced
| 1611:301d5cd4abc6 | 1612:0d36e3d7e2ea |
|---|