Mercurial > hg

view .hgignore @ 6522:2b181fb3a70a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use internal merge tool when specified for a merge-pattern in hgrc It is possible to specify in the hgrc file that one of the internal merge tools (internal:fail, internal:local or internal:other) be used for performing merges on files matching a given pattern. However, this setting is not being acted upon (the merge tool is not found). This patch fixes that.
author Dov Feldstern <dfeldstern@fastimap.com>
date Fri, 04 Apr 2008 02:21:53 +0300
parents 5d0b94d3ad0c
children 4a064e1977f8
line wrap: on
line source

syntax: glob

*.elc
*.orig
*.rej
*~
*.mergebackup
*.o
*.so
*.pyc
*.swp
*.prof
tests/.coverage*
tests/annotated
tests/*.err
build
contrib/hgsh/hgsh
dist
doc/*.[0-9]
doc/*.[0-9].gendoc.txt
doc/*.[0-9].{x,ht}ml
MANIFEST
patches
mercurial/__version__.py
Output/Mercurial-*.exe
.DS_Store
tags
cscope.*

syntax: regexp
^\.pc/