equal
deleted
inserted
replaced
41 > y |
41 > y |
42 > y |
42 > y |
43 > n |
43 > n |
44 > n |
44 > n |
45 > n |
45 > n |
46 > n |
46 > y |
47 > y |
47 > y |
48 > y |
48 > y |
49 > n |
49 > n |
50 > n |
50 > n |
51 > n |
51 > y |
52 > y |
52 > y |
53 > y |
53 > y |
54 > n |
54 > n |
55 > n |
55 > y |
56 > y |
56 > y |
57 > y |
57 > y |
58 > EOF |
58 > EOF |
59 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
59 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
60 adding a |
60 adding a |
80 diff --git a/d b/d |
80 diff --git a/d b/d |
81 new file mode 100644 |
81 new file mode 100644 |
82 examine changes to 'd'? [Ynesfdaq?] n |
82 examine changes to 'd'? [Ynesfdaq?] n |
83 |
83 |
84 created new head |
84 created new head |
85 Done splitting? [yN] n |
85 continue splitting? [Ycdq?] y |
86 diff --git a/b b/b |
86 diff --git a/b b/b |
87 new file mode 100644 |
87 new file mode 100644 |
88 examine changes to 'b'? [Ynesfdaq?] y |
88 examine changes to 'b'? [Ynesfdaq?] y |
89 |
89 |
90 @@ -0,0 +1,1 @@ |
90 @@ -0,0 +1,1 @@ |
97 |
97 |
98 diff --git a/d b/d |
98 diff --git a/d b/d |
99 new file mode 100644 |
99 new file mode 100644 |
100 examine changes to 'd'? [Ynesfdaq?] n |
100 examine changes to 'd'? [Ynesfdaq?] n |
101 |
101 |
102 Done splitting? [yN] n |
102 continue splitting? [Ycdq?] y |
103 diff --git a/c b/c |
103 diff --git a/c b/c |
104 new file mode 100644 |
104 new file mode 100644 |
105 examine changes to 'c'? [Ynesfdaq?] y |
105 examine changes to 'c'? [Ynesfdaq?] y |
106 |
106 |
107 @@ -0,0 +1,1 @@ |
107 @@ -0,0 +1,1 @@ |
110 |
110 |
111 diff --git a/d b/d |
111 diff --git a/d b/d |
112 new file mode 100644 |
112 new file mode 100644 |
113 examine changes to 'd'? [Ynesfdaq?] n |
113 examine changes to 'd'? [Ynesfdaq?] n |
114 |
114 |
115 Done splitting? [yN] n |
115 continue splitting? [Ycdq?] y |
116 diff --git a/d b/d |
116 diff --git a/d b/d |
117 new file mode 100644 |
117 new file mode 100644 |
118 examine changes to 'd'? [Ynesfdaq?] y |
118 examine changes to 'd'? [Ynesfdaq?] y |
119 |
119 |
120 @@ -0,0 +1,1 @@ |
120 @@ -0,0 +1,1 @@ |