equal
deleted
inserted
replaced
336 $ hg resolve -m b |
336 $ hg resolve -m b |
337 |
337 |
338 hg resolve with one unresolved, one resolved: |
338 hg resolve with one unresolved, one resolved: |
339 |
339 |
340 $ hg resolve --color=always -l |
340 $ hg resolve --color=always -l |
341 \x1b[0;31;1mU a\x1b[0m (esc) |
341 \x1b[0;31;1mU \x1b[0m\x1b[0;31;1ma\x1b[0m (esc) |
342 \x1b[0;32;1mR b\x1b[0m (esc) |
342 \x1b[0;32;1mR \x1b[0m\x1b[0;32;1mb\x1b[0m (esc) |
343 |
343 |
344 color coding of error message with current availability of curses |
344 color coding of error message with current availability of curses |
345 |
345 |
346 $ hg unknowncommand > /dev/null |
346 $ hg unknowncommand > /dev/null |
347 hg: unknown command 'unknowncommand' |
347 hg: unknown command 'unknowncommand' |