tests/test-graft.t
changeset 33771 96f43981c1c4
parent 32267 c2380b448265
child 35393 4441705b7111
--- a/tests/test-graft.t	Wed Aug 09 17:01:21 2017 +0200
+++ b/tests/test-graft.t	Thu Aug 03 05:12:35 2017 +0530
@@ -221,6 +221,25 @@
   $ hg summary |grep graft
   commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)
 
+Using status to get more context
+
+  $ hg status --verbose
+  M d
+  M e
+  ? a.orig
+  ? e.orig
+  # The repository is in an unfinished *graft* state.
+  
+  # Unresolved merge conflicts:
+  # 
+  #     e
+  # 
+  # To mark files as resolved:  hg resolve --mark FILE
+  
+  # To continue:                hg graft --continue
+  # To abort:                   hg update --clean .    (warning: this will discard uncommitted changes)
+  
+
 Commit while interrupted should fail:
 
   $ hg ci -m 'commit interrupted graft'