Mercurial > hg
comparison tests/test-mq-merge.t @ 20306:fe8e254c7ad6 stable
merge default into stable for 2.9 code freeze
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 21 Jan 2014 14:30:06 -0600 |
| parents | 243ea5ffdf31 |
| children | 9d4ebb75de53 |
comparison
equal
deleted
inserted
replaced
| 20213:8c69c69dbcd2 | 20306:fe8e254c7ad6 |
|---|---|
| 145 +++ b/a | 145 +++ b/a |
| 146 @@ -1,1 +1,2 @@ | 146 @@ -1,1 +1,2 @@ |
| 147 -b | 147 -b |
| 148 +a | 148 +a |
| 149 +c | 149 +c |
| 150 diff --git a/aa b/aa | 150 diff --git a/a b/aa |
| 151 new file mode 100644 | 151 copy from a |
| 152 --- /dev/null | 152 copy to aa |
| 153 --- a/a | |
| 153 +++ b/aa | 154 +++ b/aa |
| 154 @@ -0,0 +1,1 @@ | 155 @@ -1,1 +1,1 @@ |
| 156 -b | |
| 155 +a | 157 +a |
| 156 | 158 |
| 157 Check patcha2 is still a regular patch: | 159 Check patcha2 is still a regular patch: |
| 158 | 160 |
| 159 $ cat .hg/patches/patcha2 | 161 $ cat .hg/patches/patcha2 |