#11120: Autodetect installed 3-way merge programs (invalidates #4434)
------------------------+---------------------------------------------------
Reporter: kini | Owner: tbd
Type: defect | Status: needs_review
Priority: major | Milestone: sage-4.7.1
Component: packages | Keywords: mercurial osx sd31
Work_issues: | Upstream: N/A
Reviewer: | Author: Keshav Kini
Merged: | Dependencies: #11121
------------------------+---------------------------------------------------
Comment(by kini):
`hgmerge` remaining in SAGE_LOCAL/bin is not a problem; `mergetools.rc`
overrides it. I guess the best way to test this is to try to replicate
#4434 with the new spkg installed - it should be impossible.
By the way, I guess I should also eradicate `sage -hgmerge` - I'll submit
a patch (not to the Mercurial spkg but to Sage) in a bit.
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/11120#comment:15>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
