Mercurial > hg
view tests/test-merge3 @ 3751:797c6e70092b
Don't require a diff which accepts the -N option.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 01 Dec 2006 22:29:47 +0100 |
parents | 7544700fd931 |
children | 6a64813276ed |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" touch b hg add b rm b hg commit -A -m"comment #1" -d "1000000 0"