Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3 @ 4879:da8640113b5a
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 14 Jul 2007 13:34:40 -0500 |
parents | 7544700fd931 |
children |
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"