Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge4.out @ 4671:150afe6becf6
identify: take a path to a remote repo
Rather than using -R, we take a path as an argument. This lets us use
url#branch syntaxes that may be in hgrc.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 21 Jun 2007 13:09:01 -0500 |
parents | b2ae81a7df29 |
children |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
3 (branch merge, don't forget to commit) |