mq: make qnew patch format consistent with qrefresh (issue1457)

monoblue: fix child revision display in file diff page

web: use the correct filectx in filelog

convert: display child command output if --debug (fix 878466138b57)

convert: print darcs error messages iff --debug

convert: check for darcs-2-compatible path

merge with -stable

merge with crew-stable

zeroconf: add extension documentation

1 file changed, 7 insertions(+), 9 deletions(-) hgext/purge.py | 16 +++++++--------- purge: clarify behavior with regard to ignored files The purge documentation previously said that purge would delete ignored files. This is only true if purge is passed the --all option, which is now stated explicitly. A few trivial grammar errors were also fixed.

tests: shrink wait interval for test-convert-bzr-merges

Merge with crew-stable

tests: try to prevent different ordering in test-convert-bzr-merges

merge with crew

lowercase prompts The prompts are interactive and not meant for scripts.