tests/test-simplemerge-cmd.out
author Matt Mackall <mpm@selenic.com>
Sun, 02 Dec 2007 15:52:36 -0600
changeset 5576 1c1ef561d541
parent 5081 ea7b982b6c08
child 8446 e1f4343db740
permissions -rw-r--r--
doc: add repo/ to .hgignore and .hgtags These names were disappearing in the asciidoc output and no form of escaping seems to help. Let's just add repo/ to make it explicit that they're in the repository root.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5081
ea7b982b6c08 Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4364
diff changeset
     1
(binary:application/octet-stream)