Mercurial > hg
view templates/map-raw @ 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 | ba625c8083d8 |
children | f2ebd5251e88 |
line wrap: on
line source
header = header-raw.tmpl footer = "" changeset = changeset-raw.tmpl annotateline = "<tr class="parity#parity#"><td class="annotate"><a href="?cmd=changeset;node=#node#">#author#@#rev#</a></td><td><pre>#line#</pre></td></tr>" difflineplus = "#line#" difflineminus = "#line#" difflineat = "#line#" diffline = "#line#" changesetparent = "# parent: #node#" changesetchild = "# child: #node#" filenodelink = "#file#" filerevision = filerevision-raw.tmpl fileline = "#line#" diffblock = "#lines#" filediff = filediff-raw.tmpl