annotate tests/test-empty @ 2548:0229ff95faec

Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents 2b77ea66fe70
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1338
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
1 #!/bin/sh
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
2
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
3 hg init
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
4 hg log
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
5 hg grep wah
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
6 hg manifest
2b77ea66fe70 Add empty repo test
mpm@selenic.com
parents:
diff changeset
7 hg verify