Mercurial Mercurial > mercurial / 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-up-local-change
changeset 547 4fc63e22b1fe
parent 485 c5705ab9cebd
parent 544 3d4d5f2aba9a
child 591 eb46971fc57f
equal deleted inserted replaced
540:53872e2be33a 547:4fc63e22b1fe 
     1 #!/bin/bash
 
     1 #!/bin/sh
 
     2 
     2 
     3 export HGMERGE=true
 
     3 export HGMERGE=true
 
     4 
     4 
     5 set -ex
 
     5 set -ex
 
     6 mkdir r1
 
     6 mkdir r1
mercurial