Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 21 Jul 2006 01:40:07 +0200
changeset 2647 46182568b4ce
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
change 'hg tag' to tag the parent rev instead of tip
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)
Mercurial