163   [1]

   163   [1]

   164   $ cat b

   164   $ cat b

   165   a

   165   a

   166   a

   166   a

   167   a

   167   a

   169   b4

   169   b4

   170   c

   170   c

   171   b5

   171   b5

   173   =======

   173   =======

   174   b4

   174   b4

   175   b5

   175   b5

   176   b6

   176   b6

   178   $ cat <<EOF > b

   178   $ cat <<EOF > b

   179   > a

   179   > a

   180   > a

   180   > a

   181   > a

   181   > a

   182   > b4

   182   > b4

   787   $ hg commit -m 3 -q

   787   $ hg commit -m 3 -q

   788   $ hg merge 2 -q

   788   $ hg merge 2 -q

   789   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')

   789   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')

   790   [1]

   790   [1]

   791   $ cat a

   791   $ cat a

   793   1

   793   1

   794   2

   794   2

   795   3

   795   3

   797   1

   797   1

   798   2

   798   2

   799   =======

   799   =======

   800   a

   800   a

   802   $ cat > a << EOF

   802   $ cat > a << EOF

   803   > b

   803   > b

   804   > 1

   804   > 1

   805   > 2

   805   > 2

   806   > 3

   806   > 3