Mercurial Mercurial > hg-stable / 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-merge5.out
author Markus F.X.J. Oberhumer <markus@oberhumer.com>
Mon, 25 Jun 2007 14:46:20 +0200
changeset 4709 53eca35c3aeb
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
Add option "hidden" to hgwebdir. TODO: should this option be renamed to 'hide_from_index' or maybe to 'index_ignore' (like Apache's mod_autoindex) ?
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: 2038
diff changeset 
     1
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset 
     2
 
removing b
3592
fffc8a733bf9 Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3580
diff changeset 
     3
 
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
hg-stable