#11120: Autodetect installed 3-way merge programs (invalidates #4434)
------------------------------------------+---------------------------------
Reporter: kini | Owner: tbd
Type: defect | Status: positive_review
Priority: major | Milestone: sage-4.7.2
Component: packages | Keywords: mercurial osx sd31
Work_issues: | Upstream: N/A
Reviewer: John Palmieri, Keshav Kini | Author: Keshav Kini, John
Palmieri
Merged: | Dependencies: #4434, #10594
------------------------------------------+---------------------------------
Comment(by dimpase):
Replying to [comment:20 kini]:
> Looks fine. All doctests pass (though I doubt `hgmerge` was doctested
anyway...). Grepping for "hgmerge" doesn't find anything significant.
Eradication successful! Positive review from me.
would be good to state clearly in the ticket description which patches
should be applied, and which should not be applied.
I.e, is trac_11120-re-fix-trac_4434.mercurial-spkg.patch needed?
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/11120#comment:21>
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.
