Mercurial Mercurial > pub > hg > evolve / 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-stabilize-conflict.t
branchstable
changeset 1167 a1f5a948420d
parent 1131 a44a26f8cc48
child 1185 cc3e68120185
equal deleted inserted replaced
1166:30b478854260 1167:a1f5a948420d 
     6 
     6 
     7   $ cat >> $HGRCPATH <<EOF
 
     7   $ cat >> $HGRCPATH <<EOF
 
     8   > [ui]
 
     8   > [ui]
 
     9   > interactive=false
 
     9   > interactive=false
 
    10   > merge=internal:merge
 
    10   > merge=internal:merge
 
       
    11   > promptecho = True
 
    11   > [defaults]
 
    12   > [defaults]
 
    12   > amend=-d "0 0"
 
    13   > amend=-d "0 0"
 
    13   > [merge-tools]
 
    14   > [merge-tools]
 
    14   > touch.checkchanged=true
 
    15   > touch.checkchanged=true
 
    15   > touch.gui=true
 
    16   > touch.gui=true
evolve