##// END OF EJS Templates
subrepo: Turn off interactive mode when merging mercurial repo....
subrepo: Turn off interactive mode when merging mercurial repo. If there is a merge conflict in the sub repositories mercurial will prompt the used to decide which version to use.

File last commit:

r14:5064a23f default
r99:e1008af8 default
Show More
.hgignore
36 lines | 354 B | text/plain | TextLexer
syntax: glob
*.orig
*.pyc
*.swp
*.tox
*.egg-info
*.egg
*.idea
.DS_Store*
syntax: regexp
#.filename
^\.settings$
^\.project$
^\.pydevproject$
^\.coverage$
^\.cache.*$
^\.rhodecode$
^_dev
^._dev
^build/
^coverage\.xml$
^data$
^dev.ini$
^acceptance_tests/dev.*\.ini$
^dist/
^fabfile.py
^htmlcov
^junit\.xml$
^node_modules/
^pylint.log$
^build$
^result$