equal
deleted
inserted
replaced
111 |
111 |
112 % ...but there's another copy between the original rev and the wd |
112 % ...but there's another copy between the original rev and the wd |
113 diff --git a/created b/created3 |
113 diff --git a/created b/created3 |
114 rename from created |
114 rename from created |
115 rename to created3 |
115 rename to created3 |
|
116 |
|
117 % ...but the source of the copy was created after the original rev |
|
118 diff --git a/created3 b/created3 |
|
119 new file mode 100644 |
|
120 --- /dev/null |
|
121 +++ b/created3 |
|
122 @@ -0,0 +1,1 @@ |
|
123 + |
|
124 % created in parent of wd; renamed in the wd |
|
125 diff --git a/brand-new b/brand-new2 |
|
126 rename from brand-new |
|
127 rename to brand-new2 |
|
128 |
|
129 % created between r1 and parent of wd; renamed in the wd |
|
130 diff --git a/brand-new2 b/brand-new2 |
|
131 new file mode 100644 |
|
132 --- /dev/null |
|
133 +++ b/brand-new2 |
|
134 @@ -0,0 +1,1 @@ |
|
135 + |