##// END OF EJS Templates
tests: adjust expected prompt choice outputs in test-record.t for Windows...
FUJIWARA Katsunori -
r23054:40c01f95 stable
parent child Browse files
Show More
@@ -963,12 +963,14 b' Mock "Preserve chmod +x"'
963 > EOF
963 > EOF
964 diff --git a/subdir/f1 b/subdir/f1
964 diff --git a/subdir/f1 b/subdir/f1
965 1 hunks, 1 lines changed
965 1 hunks, 1 lines changed
966 examine changes to 'subdir/f1'? [Ynesfdaq?]
966 examine changes to 'subdir/f1'? [Ynesfdaq?] y
967
967 @@ -1,2 +1,3 @@
968 @@ -1,2 +1,3 @@
968 a
969 a
969 a
970 a
970 +a
971 +a
971 record this change to 'subdir/f1'? [Ynesfdaq?]
972 record this change to 'subdir/f1'? [Ynesfdaq?] y
973
972
974
973 $ hg tip --config diff.git=True -p
975 $ hg tip --config diff.git=True -p
974 changeset: 22:0d463bd428f5
976 changeset: 22:0d463bd428f5
@@ -996,13 +998,15 b' Mock "Preserve execute permission on ori'
996 > EOF
998 > EOF
997 diff --git a/subdir/f1 b/subdir/f1
999 diff --git a/subdir/f1 b/subdir/f1
998 1 hunks, 1 lines changed
1000 1 hunks, 1 lines changed
999 examine changes to 'subdir/f1'? [Ynesfdaq?]
1001 examine changes to 'subdir/f1'? [Ynesfdaq?] y
1002
1000 @@ -1,3 +1,4 @@
1003 @@ -1,3 +1,4 @@
1001 a
1004 a
1002 a
1005 a
1003 a
1006 a
1004 +b
1007 +b
1005 record this change to 'subdir/f1'? [Ynesfdaq?]
1008 record this change to 'subdir/f1'? [Ynesfdaq?] y
1009
1006
1010
1007 $ hg tip --config diff.git=True -p
1011 $ hg tip --config diff.git=True -p
1008 changeset: 23:0eab41a3e524
1012 changeset: 23:0eab41a3e524
@@ -1032,13 +1036,15 b' Mock "Preserve chmod -x"'
1032 > EOF
1036 > EOF
1033 diff --git a/subdir/f1 b/subdir/f1
1037 diff --git a/subdir/f1 b/subdir/f1
1034 1 hunks, 1 lines changed
1038 1 hunks, 1 lines changed
1035 examine changes to 'subdir/f1'? [Ynesfdaq?]
1039 examine changes to 'subdir/f1'? [Ynesfdaq?] y
1040
1036 @@ -2,3 +2,4 @@
1041 @@ -2,3 +2,4 @@
1037 a
1042 a
1038 a
1043 a
1039 b
1044 b
1040 +c
1045 +c
1041 record this change to 'subdir/f1'? [Ynesfdaq?]
1046 record this change to 'subdir/f1'? [Ynesfdaq?] y
1047
1042
1048
1043 $ hg tip --config diff.git=True -p
1049 $ hg tip --config diff.git=True -p
1044 changeset: 24:f4f718f27b7c
1050 changeset: 24:f4f718f27b7c
General Comments 0
You need to be logged in to leave comments. Login now