Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3 @ 3928:4df475e22248
Sync with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Dec 2006 21:48:22 -0600 |
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"