tests/test-conflict
changeset 544 3d4d5f2aba9a
parent 392 ee4c80d294e5
child 547 4fc63e22b1fe
equal deleted inserted replaced
543:61ead26cb8f0 544:3d4d5f2aba9a
     1 #!/bin/bash
     1 #!/bin/sh
     2 
     2 
     3 set -x
     3 set -x
     4 hg init
     4 hg init
     5 echo "nothing" > a
     5 echo "nothing" > a
     6 hg add a
     6 hg add a