Mercurial > hg
comparison tests/test-issue522.t @ 26420:2fc86d92c4a9
urls: bulk-change BTS urls to new location
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 30 Sep 2015 15:31:07 -0500 |
| parents | bd625cd4e5e7 |
| children | 009d0283de5f |
comparison
equal
deleted
inserted
replaced
| 26415:46af0adb5c37 | 26420:2fc86d92c4a9 |
|---|---|
| 1 http://mercurial.selenic.com/bts/issue522 | 1 https://bz.mercurial-scm.org/522 |
| 2 | 2 |
| 3 In the merge below, the file "foo" has the same contents in both | 3 In the merge below, the file "foo" has the same contents in both |
| 4 parents, but if we look at the file-level history, we'll notice that | 4 parents, but if we look at the file-level history, we'll notice that |
| 5 the version in p1 is an ancestor of the version in p2. This test makes | 5 the version in p1 is an ancestor of the version in p2. This test makes |
| 6 sure that we'll use the version from p2 in the manifest of the merge | 6 sure that we'll use the version from p2 in the manifest of the merge |