Mercurial Mercurial > hg / 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-merge-commit
changeset 4365 46280c004f22
parent 4058 e7282dede8cd
child 8167 6c82beaaa11a
equal deleted inserted replaced
4364:d5c3a70f8422 4365:46280c004f22 
     1 #!/bin/sh
 
     1 #!/bin/sh
 
     2 # check that renames are correctly saved by a commit after a merge
 
     2 # check that renames are correctly saved by a commit after a merge
 
     3 
       
     4 HGMERGE=merge
 
       
     5 export HGMERGE
 
       
     6 
     3 
     7 # test with the merge on 3 having the rename on the local parent
 
     4 # test with the merge on 3 having the rename on the local parent
 
     8 hg init a
 
     5 hg init a
 
     9 cd a
 
     6 cd a
 
    10 
     7
Mercurial