Mercurial > hg

view tests/test-demandimport.py.out @ 21537:1ab30e9ba0fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: specify custom conflict markers for update (BC) Add custom conflict markers 'working copy' and 'destination' for doing hg update when there are conflicts between your working copy and the destination.
author Durham Goode <durham@fb.com>
date Fri, 09 May 2014 18:09:11 -0700
parents 54af51c18c4c
children 0d0f4070f6d7
line wrap: on
line source

os = <unloaded module 'os'>
os.system = <built-in function system>
os = <module 'os' 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.stderr = <open file '<whatever>', mode 'w' at 0x?>
re = <proxied module 'sys'>
node = <module 'mercurial.node' from '?'>