Thread (7 messages) flat view 7 messages, 3 authors, 2016-06-15

Re: [PATCH] mergetool--lib: add support for araxis merge

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:46:42

Hi,

On Sat, 2 May 2009, David Aguilar wrote:
Araxis merge is now a built-in diff/merge tool.
This adds araxis to git-completion and updates
the documentation as well.

Signed-off-by: David Aguilar <redacted>
---

This patch is a result of the discussion on the msysgit list:

http://groups.google.com/group/msysgit/browse_thread/thread/fa353fa2240594d7

'compare' is the command-line utility that is provided
on MacOS.  Users on other platforms may have to manually
set their mergetool.araxis.path.
The only reason I did not merge that patch sent to msysgit@googlegroups 
was that I did not have _any_ confirmation that it works.

Do you have any?  As Araxis is not free software, I refuse to touch it.

Ciao,
Dscho
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help