##// END OF EJS Templates
Use of opendiff as merge program on MacOS X...
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.
Christian Ebert -
r1647:64a1169c default
Show More
Name Size Modified Last Commit Author
/ mercurial
__init__.py Loading ...
bdiff.c Loading ...
byterange.py Loading ...
changelog.py Loading ...
commands.py Loading ...
demandload.py Loading ...
dirstate.py Loading ...
fancyopts.py Loading ...
filelog.py Loading ...
hg.py Loading ...
hgweb.py Loading ...
httprangereader.py Loading ...
httprepo.py Loading ...
i18n.py Loading ...
localrepo.py Loading ...
lock.py Loading ...
manifest.py Loading ...
mdiff.py Loading ...
mpatch.c Loading ...
node.py Loading ...
packagescan.py Loading ...
remoterepo.py Loading ...
repo.py Loading ...
revlog.py Loading ...
sshrepo.py Loading ...
statichttprepo.py Loading ...
transaction.py Loading ...
ui.py Loading ...
util.py Loading ...
version.py Loading ...