Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge4.out @ 2597:5ba8be56fa8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clone: move code into hg module. make doc better. api in commands module is still same, but version in hg is best for calling within python now.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 11 Jul 2006 16:18:53 -0700
parents b2ae81a7df29
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)