##// END OF EJS Templates
graft: use single quotes around command hint...
timeless -
r28963:fc1d75e7 default
parent child Browse files
Show More
@@ -60,7 +60,7 b' Revert should fail:'
60
60
61 $ hg revert
61 $ hg revert
62 abort: uncommitted merge with no revision specified
62 abort: uncommitted merge with no revision specified
63 (use "hg update" or see "hg help revert")
63 (use 'hg update' or see 'hg help revert')
64 [255]
64 [255]
65
65
66 Revert should be ok now:
66 Revert should be ok now:
@@ -209,7 +209,7 b' Graft out of order, skipping a merge and'
209 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
209 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
210 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
210 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
211 abort: unresolved conflicts, can't continue
211 abort: unresolved conflicts, can't continue
212 (use hg resolve and hg graft --continue --log)
212 (use 'hg resolve' and 'hg graft --continue --log')
213 [255]
213 [255]
214
214
215 Summary should mention graft:
215 Summary should mention graft:
@@ -246,7 +246,7 b' Graft again:'
246 merging e
246 merging e
247 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
247 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
248 abort: unresolved conflicts, can't continue
248 abort: unresolved conflicts, can't continue
249 (use hg resolve and hg graft --continue)
249 (use 'hg resolve' and 'hg graft --continue')
250 [255]
250 [255]
251
251
252 Continue without resolve should fail:
252 Continue without resolve should fail:
@@ -441,7 +441,7 b' Resolve conflicted graft'
441 $ hg graft 1 --tool internal:fail
441 $ hg graft 1 --tool internal:fail
442 grafting 1:5d205f8b35b6 "1"
442 grafting 1:5d205f8b35b6 "1"
443 abort: unresolved conflicts, can't continue
443 abort: unresolved conflicts, can't continue
444 (use hg resolve and hg graft --continue)
444 (use 'hg resolve' and 'hg graft --continue')
445 [255]
445 [255]
446 $ hg resolve --all
446 $ hg resolve --all
447 merging a
447 merging a
@@ -481,7 +481,7 b' Resolve conflicted graft with rename'
481 $ hg graft 2 --tool internal:fail
481 $ hg graft 2 --tool internal:fail
482 grafting 2:5c095ad7e90f "2"
482 grafting 2:5c095ad7e90f "2"
483 abort: unresolved conflicts, can't continue
483 abort: unresolved conflicts, can't continue
484 (use hg resolve and hg graft --continue)
484 (use 'hg resolve' and 'hg graft --continue')
485 [255]
485 [255]
486 $ hg resolve --all
486 $ hg resolve --all
487 merging a and b to b
487 merging a and b to b
@@ -768,7 +768,7 b' graft --continue after --force'
768 $ hg graft 28 --force --tool internal:fail
768 $ hg graft 28 --force --tool internal:fail
769 grafting 28:50a516bb8b57 "28"
769 grafting 28:50a516bb8b57 "28"
770 abort: unresolved conflicts, can't continue
770 abort: unresolved conflicts, can't continue
771 (use hg resolve and hg graft --continue)
771 (use 'hg resolve' and 'hg graft --continue')
772 [255]
772 [255]
773 $ hg resolve --all
773 $ hg resolve --all
774 merging a
774 merging a
@@ -72,7 +72,7 b' http://bz.selenic.com/show_bug.cgi?id=44'
72 merging b
72 merging b
73 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
73 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
74 abort: unresolved conflicts, can't continue
74 abort: unresolved conflicts, can't continue
75 (use hg resolve and hg graft --continue)
75 (use 'hg resolve' and 'hg graft --continue')
76 [255]
76 [255]
77 $ echo a > b
77 $ echo a > b
78 $ echo b3 >> b
78 $ echo b3 >> b
General Comments 0
You need to be logged in to leave comments. Login now