Mercurial > hg

view tests/test-issue433.t @ 12765:5eed9ceebd64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: when --tool is specified, disable HGMERGE by setting to empty string HGMERGE has different semantics than ui.merge. HGMERGE should hold the name on an executable in your path, or an absolute tool path. As such, it's not safe to simply copy the user's specified --tool value into HGMERGE. Instead, we disable HGMERGE by setting it to an empty string.
author Steve Borho <steve@borho.org>
date Mon, 18 Oct 2010 23:20:14 -0500
parents 3b165c127690
children
line wrap: on
line source

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

  $ hg init
  $ echo a > a
  $ hg commit -Ama
  adding a

  $ hg parents -r 0 doesnotexist
  abort: 'doesnotexist' not found in manifest!
  [255]