Mercurial > hg
view tests/test-issue842.t @ 13565:984175605311 stable
filemerge: introduce a 'regkeyalt' merge tool variable
This allows us to provide alternate search keys for 64bit operating systems that
may have 32bit merge tools installed. Presumably it may find other uses.
author | Steve Borho <steve@borho.org> |
---|---|
date | Tue, 08 Mar 2011 13:05:18 -0600 |
parents | b63f6422d2a7 |
children | 41885892796e |
line wrap: on
line source
http://mercurial.selenic.com/bts/issue842 $ hg init $ echo foo > a $ hg ci -Ama adding a $ hg up -r0000 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo bar > a Should issue new head warning: $ hg ci -Amb adding a created new head $ hg up -r0000 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo stuffy > a Should not issue new head warning: $ hg ci -q -Amc $ hg up -r0000 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo crap > a $ hg branch testing marked working directory as branch testing Should not issue warning: $ hg ci -q -Amd