tests/test-merge4.t
author Steve Borho <steve@borho.org>
Thu, 30 Jun 2011 12:55:19 -0500
branchstable
changeset 14819 b30c889584ef
parent 12156 4c94b6d0fb1c
child 16536 63c817ea4a70
permissions -rw-r--r--
wix: catch up with more added files revsets: 1.7::tip and adds("mercurial/help/**") 1.7::tip and adds("mercurial/templates/**")

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg update 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  $ echo This is file c1 > c
  $ hg add c
  $ hg commit -m "commit #2"
  created new head
  $ hg merge 1
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ rm b
  $ echo This is file c22 > c
  $ hg commit -m "commit #3"