278 

   279 Resolve conflicted graft

   280   $ hg up -q 0

   281   $ echo b > a

   282   $ hg ci -m 8

   283   created new head

   284   $ echo a > a

   285   $ hg ci -m 9

   286   $ hg graft 1 --tool internal:fail

   287   grafting revision 1

   288   abort: unresolved conflicts, can't continue

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

   290   [255]

   291   $ hg resolve --all

   292   merging a

   293   $ hg graft -c

   294   grafting revision 1

   295   $ hg export tip --git

   296   # HG changeset patch

   297   # User bar

   298   # Date 0 0

   299   # Node ID 64ecd9071ce83c6e62f538d8ce7709d53f32ebf7

   300   # Parent  4bdb9a9d0b84ffee1d30f0dfc7744cade17aa19c

   301   1

   302   

   303   diff --git a/a b/a

   304   --- a/a

   305   +++ b/a

   306   @@ -1,1 +1,1 @@

   307   -a

   308   +b

   309 

   310 Resolve conflicted graft with rename

   311   $ echo c > a

   312   $ hg ci -m 10

   313   $ hg graft 2 --tool internal:fail

   314   grafting revision 2

   315   abort: unresolved conflicts, can't continue

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

   317   [255]

   318   $ hg resolve --all

   319   merging a and b to b

   320   $ hg graft -c

   321   grafting revision 2

   322   $ hg export tip --git

   323   # HG changeset patch

   324   # User test

   325   # Date 0 0

   326   # Node ID 2e80e1351d6ed50302fe1e05f8bd1d4d412b6e11

   327   # Parent  e5a51ae854a8bbaaf25cc5c6a57ff46042dadbb4

   328   2

   329   

   330   diff --git a/a b/b

   331   rename from a

   332   rename to b