39 echo "we shouldn't have anything but n state here"

    39 echo "we shouldn't have anything but n state here"

    40 hg debugstate | cut -b 1-16,35-

    40 hg debugstate | cut -b 1-16,35-

    41 

    41 

    42 echo merging

    42 echo merging

    43 hg pull ../a

    43 hg pull ../a

    45 

    45 

    46 echo 2m > foo

    46 echo 2m > foo

    47 echo 2b > baz

    47 echo 2b > baz

    48 echo new > quux

    48 echo new > quux

    49 

    49