tests/test-rebase-conflicts.t
changeset 20117 aa9385f983fa
parent 19969 ad9db007656f
child 20545 5936058f6bad
equal deleted inserted replaced
20116:9e0219967e38 20117:aa9385f983fa
     1   $ cat >> $HGRCPATH <<EOF
     1   $ cat >> $HGRCPATH <<EOF
     2   > [extensions]
     2   > [extensions]
     3   > graphlog=
       
     4   > rebase=
     3   > rebase=
     5   > 
     4   > 
     6   > [phases]
     5   > [phases]
     7   > publish=False
     6   > publish=False
     8   > 
     7   >