tests/test-586.out
author Brendan Cully <brendan@kublai.com>
Fri, 29 Feb 2008 14:47:07 -0800
changeset 6198 358cc9cf54db
parent 5764 8a5d8fb59ed2
child 7564 f1af59451c0c
permissions -rw-r--r--
highlight: guess by text when path name is ambiguous Although the docs claim that guess_lexer_for_filename will fall back to using file data, my ubuntu 7.10 pygments library seems to ignore the text argument. So call guess_lexer explicitly on failure.

adding a
adding b
pulling from ../a
searching for changes
warning: repository is unrelated
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
C b