tests/test-issue1089.t
author Steve Borho <steve@borho.org>
Fri, 22 Oct 2010 11:58:43 -0500
branchstable
changeset 12810 a68ccfd9c7be
parent 12328 b63f6422d2a7
child 15447 9910f60a37ee
permissions -rw-r--r--
backout: add --tool argument for specifying merge tool

http://mercurial.selenic.com/bts/issue1089

  $ hg init
  $ mkdir a
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b
  $ hg ci -m m a

  $ mkdir a b
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b
  $ cd b

Relative delete:

  $ hg ci -m m ../a