Mercurial > hg
comparison tests/test-issue522.t @ 12328:b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Fri, 17 Sep 2010 17:03:08 -0500 |
| parents | ee41be2bbf5a |
| children | ec5886db9dc6 |
comparison
equal
deleted
inserted
replaced
| 12327:92e30e135581 | 12328:b63f6422d2a7 |
|---|---|
| 1 # http://mercurial.selenic.com/bts/issue522 | 1 http://mercurial.selenic.com/bts/issue522 |
| 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 | 5 the version in p1 is an ancestor of the version in p2. This test makes |
| 6 # makes sure that we'll use the version from p2 in the manifest of the | 6 sure that we'll use the version from p2 in the manifest of the merge |
| 7 # merge revision. | 7 revision. |
| 8 | 8 |
| 9 $ hg init | 9 $ hg init |
| 10 | 10 |
| 11 $ echo foo > foo | 11 $ echo foo > foo |
| 12 $ hg ci -qAm 'add foo' | 12 $ hg ci -qAm 'add foo' |