Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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 Frank Kingswood <frank@kingswood-consulting.co.uk>
Mon, 24 Jul 2006 23:06:05 -0700
changeset 2666 ebf033bc8eb2
parent 2175 b2ae81a7df29
permissions -rw-r--r--
hgweb: Configurable zebra stripes With this change, you can set [web] stripes=3 to get stripes every three lines (a-la fanfold paper), instead of every line on source and directory listings. The default behaviour is stripes=1 which generates output similar to current, and you can also turn stripes off by setting it to 0.
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-crew-with-dirclash