equal
deleted
inserted
replaced
147 +++ b/a |
147 +++ b/a |
148 @@ -1,1 +1,2 @@ |
148 @@ -1,1 +1,2 @@ |
149 -b |
149 -b |
150 +a |
150 +a |
151 +c |
151 +c |
152 diff --git a/a b/aa |
152 diff --git a/aa b/aa |
153 copy from a |
153 new file mode 100644 |
154 copy to aa |
154 --- /dev/null |
155 --- a/a |
|
156 +++ b/aa |
155 +++ b/aa |
157 @@ -1,1 +1,1 @@ |
156 @@ -0,0 +1,1 @@ |
158 -b |
|
159 +a |
157 +a |
160 |
158 |
161 Check patcha2 is still a regular patch: |
159 Check patcha2 is still a regular patch: |
162 |
160 |
163 $ cat .hg/patches/patcha2 |
161 $ cat .hg/patches/patcha2 |