Mercurial > hg
view .hgignore @ 6206:0b6f12495276
fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 05 Mar 2008 09:10:45 -0800 |
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/