Mercurial > hg
view tests/test-demandimport.out @ 6521:a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:20:58 +0300 |
parents | e3afa670e484 |
children | 9626819b2e3d |
line wrap: on
line source
os = <unloaded module 'os'> os.system = <built-in function system> os = <module 'os' from '?'> mercurial.version = <unloaded module 'version'> mercurial.version.get_version = <function get_version at 0x?> mercurial.version = <module 'mercurial.version' from '?'> mercurial = <module 'mercurial' from '?'> util = <unloaded module 'util'> util.system = <function system at 0x?> util = <module 'mercurial.util' from '?'> util.system = <function system at 0x?> fred = <unloaded module 're'> re = <unloaded module 'sys'> fred = <unloaded module 're'> fred.sub = <function sub at 0x?> fred = <proxied module 're'> re = <unloaded module 'sys'> re.stdout = <open file '<stdout>', mode 'w' at 0x?> re = <proxied module 'sys'>