#11120: Re-fix #4434 (merging broken on OS X) using MergeToolConfiguration in
Mercurial 1.x
------------------------+---------------------------------------------------
Reporter: kini | Owner: tbd
Type: defect | Status: new
Priority: major | Milestone: sage-4.7
Component: packages | Keywords: mercurial, os x
Author: | Upstream: N/A
Reviewer: | Merged:
Work_issues: |
------------------------+---------------------------------------------------
Comment(by dimpase):
hmm, how does one check that removing hgmerge does not break things?
reading #4434 says it's about a 3-way graphical thing, of which I am
clueless...
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/11120#comment:1>
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.
