Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.

     1

*** 'a\nc\n\n\n\n' 'a\nb\n\n\n'

     2

*** 'a\nb\nc\n' 'a\nc\n'

     3

*** '' ''

     4

*** 'a\nb\nc' 'a\nb\nc'

     5

*** 'a\nb\nc\nd\n' 'a\nd\n'

     6

*** 'a\nb\nc\nd\n' 'a\nc\ne\n'

     7

*** 'a\nb\nc\n' 'a\nc\n'

     8

*** 'a\n' 'c\na\nb\n'

     9

*** 'a\n' ''

    10

*** 'a\n' 'b\nc\n'

    11

*** 'a\n' 'c\na\n'

    12

*** '' 'adjfkjdjksdhfksj'

    13

*** '' 'ab'

    14

*** '' 'abc'

    15

*** 'a' 'a'

    16

*** 'ab' 'ab'

    17

*** 'abc' 'abc'

    18

*** 'a\n' 'a\n'

    19

*** 'a\nb' 'a\nb'

    20

done