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-hgrc.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 03 Jul 2006 19:14:29 +0200
changeset 2548 0229ff95faec
parent 1474 1e47f6fc0fdc
permissions -rw-r--r--
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1474
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     1
 
abort: Failed to parse .../t/.hg/hgrc
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     2
 
File contains no section headers.
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     3
 
file: .../t/.hg/hgrc, line: 1
1e47f6fc0fdc Add missing test output
Matt Mackall <mpm@selenic.com>
parents:
diff changeset 
     4
 
'invalid\n'
mercurial-crew-with-dirclash