comparison tests/test-commit-unresolved.t @ 20306:fe8e254c7ad6 stable

merge default into stable for 2.9 code freeze

20213:8c69c69dbcd2

  $ echo "[extensions]" >> $HGRCPATH
  $ echo "graphlog=" >> $HGRCPATH

  $ addcommit () {
  >     echo $1 > $1
  >     hg add $1
  >     hg commit -d "${2} 0" -m $1
  > }

20306:fe8e254c7ad6

  $ addcommit () {
  >     echo $1 > $1
  >     hg add $1
  >     hg commit -d "${2} 0" -m $1
  > }