Mercurial > hg > mercurial-crew-with-dirclash
view MANIFEST.in @ 1647:64a1169c927d
Use of opendiff as merge program on MacOS X
Hello,
If one has the developer tools installed on MacOS X there's
another alternative for the merge program.
Invocation could be done somehow like in the attached patch for
hgmerge.
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Sun, 29 Jan 2006 10:10:00 +1300 |
parents | a0ce13606208 |
children | ea8345a7a29d |
line wrap: on
line source
include hg recursive-include mercurial *.py include hgweb.cgi hgwebdir.cgi include hgeditor rewrite-log include tests/README tests/run-tests tests/test-*[a-z0-9] tests/*.out prune tests/*.err include *.txt include templates/map templates/map-*[a-z0-9] include templates/*.tmpl include doc/README doc/Makefile doc/*.txt doc/*.html doc/*.[0-9] recursive-include contrib * include README include CONTRIBUTORS include COPYING include Makefile include MANIFEST.in