Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge4.out @ 3366:dca067d751a9
gitweb: Fixed parent/child links when viewing a file revision.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 12 Oct 2006 17:48:09 +0200 |
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) |