Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3 @ 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 | 0902ffece4b4 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "0 0" touch b hg add b rm b hg commit -A -m"comment #1" -d "0 0"