Mercurial Mercurial > hg-stable / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge10.out
changeset 5863 3d1f9dcecdea
parent 4696 59b8f9361545
child 6338 0750f11152fe
equal deleted inserted replaced
5861:b860b116dea4 5863:3d1f9dcecdea 
    12 (branch merge, don't forget to commit)
 
    12 (branch merge, don't forget to commit)
 
    13 M testdir/subdir/a
 
    13 M testdir/subdir/a
 
    14 diff -r d02b3fc32762 testdir/subdir/a
 
    14 diff -r d02b3fc32762 testdir/subdir/a
 
    15 --- a/testdir/subdir/a
 
    15 --- a/testdir/subdir/a
 
    16 +++ b/testdir/subdir/a
 
    16 +++ b/testdir/subdir/a
 
    17 @@ -1,1 +1,1 @@ a
 
    17 @@ -1,1 +1,1 @@
 
    18 -a
 
    18 -a
 
    19 +alpha
 
    19 +alpha
hg-stable