Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge3 @ 1126:624a3a4fa232
Changed printing of copies in hg debugstate to: "copy: source -> dest"
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 28 Aug 2005 16:24:04 +0200 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh |
402 | 2 |
3 hg init | |
4 echo This is file a1 > a | |
5 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
402
diff
changeset
|
6 hg commit -m "commit #0" -d "0 0" |
402 | 7 touch b |
8 hg add b | |
9 rm b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
402
diff
changeset
|
10 hg commit -A -m"comment #1" -d "0 0" |