244 Fix up:

   244 Fix up:

   245 

   245 

   246   $ echo b > e

   246   $ echo b > e

   247   $ hg resolve -m e

   247   $ hg resolve -m e

   248   (no more unresolved files)

   248   (no more unresolved files)

   249 

   250 

   250 Continue with a revision should fail:

   251 Continue with a revision should fail:

   251 

   252 

   252   $ hg graft -c 6

   253   $ hg graft -c 6

   253   abort: can't specify --continue and revisions

   254   abort: can't specify --continue and revisions

   438   b

   439   b

   439   >>>>>>> other: 5d205f8b35b6  - bar: 1

   440   >>>>>>> other: 5d205f8b35b6  - bar: 1

   440   $ echo b > a

   441   $ echo b > a

   441   $ hg resolve -m a

   442   $ hg resolve -m a

   442   (no more unresolved files)

   443   (no more unresolved files)

   443   $ hg graft -c

   445   $ hg graft -c

   444   grafting 1:5d205f8b35b6 "1"

   446   grafting 1:5d205f8b35b6 "1"

   445   $ hg export tip --git

   447   $ hg export tip --git

   446   # HG changeset patch

   448   # HG changeset patch

   447   # User bar

   449   # User bar

   467   (use hg resolve and hg graft --continue)

   469   (use hg resolve and hg graft --continue)

   468   [255]

   470   [255]

   469   $ hg resolve --all

   471   $ hg resolve --all

   470   merging a and b to b

   472   merging a and b to b

   471   (no more unresolved files)

   473   (no more unresolved files)

   472   $ hg graft -c

   475   $ hg graft -c

   473   grafting 2:5c095ad7e90f "2"

   476   grafting 2:5c095ad7e90f "2"

   474   $ hg export tip --git

   477   $ hg export tip --git

   475   # HG changeset patch

   478   # HG changeset patch

   476   # User test

   479   # User test

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

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

   758   [1]

   761   [1]

   759   $ echo abc > a

   762   $ echo abc > a

   760   $ hg resolve -m a

   763   $ hg resolve -m a

   761   (no more unresolved files)

   764   (no more unresolved files)

   762   $ hg graft -c

   766   $ hg graft -c

   763   grafting 28:50a516bb8b57 "28"

   767   grafting 28:50a516bb8b57 "28"

   764   $ cat a

   768   $ cat a

   765   abc

   769   abc

   766 

   770