tests/test-issue1089.t
author Matt Mackall <mpm@selenic.com>
Sat, 05 Mar 2011 16:34:59 -0600
changeset 13536 fac040b7e822
parent 12328 b63f6422d2a7
child 15447 9910f60a37ee
permissions -rw-r--r--
merge: drop resolve state for mergers with identical contents (issue2680)

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