tests/test-context.py.out
author Siddharth Agarwal <sid0@fb.com>
Sat, 26 Jul 2014 14:54:36 -0700
changeset 21980 f4e5753745e9
parent 21837 61b333b982ea
child 22914 c95db3208a33
permissions -rw-r--r--
graft: make --force apply across continues (issue3220) Since --force determines the list of revisions to be grafted, it doesn't really make sense for users to have to keep typing --force --continue as they continue grafting.

workingfilectx.date = (1000, 0)
ASCII   : Gr?ezi!
Latin-1 : Grezi!
UTF-8   : Grüezi!
(['foo'], [], [], [], [], [], [])
diff --git a/foo b/foo

--- a/foo
+++ b/foo
@@ -1,1 +1,2 @@
 foo
+bar