merge: report all files in _checkunknown When doing hg up, if there is a file conflict with untracked files, currently only the first such conflict is reported. With this patch, all of them are listed. With this patch error message is now reported as a: untracked file differs b: untracked file differs abort: untracked files in working directory conflict with files in requested revision instead of abort: untracked file in working directory differs from file in requested revision: 'a' This is a follow up to an old attempt to do this here: http://selenic.com/pipermail/mercurial-devel/2011-August/033625.html

     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

6 6 'y\n\n'

    21

6 6 'y\n\n'

    22

9 9 'y\n\n'

    23

done

    24

done