Re: [PATCH] mergetool--lib: add support for araxis merge
From: Markus Heidelberg <hidden>
Date: 2016-06-15 22:46:49
David Aguilar, 18.05.2009:
quoted hunk ↗ jump to hunk
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 applies on top of the da/mergetool-lib branch currently in pu. This is a rework of a patch to add araxis support to mergetool which originated on the msysgit list. The commented-out "-titleN:" options were intentionally left out of this patch because no amount of shell-quoting could get it to work when the title contained spaces. http://groups.google.com/group/msysgit/browse_thread/thread/fa353fa2240594d7 Documentation/git-difftool.txt | 2 +- Documentation/git-mergetool.txt | 2 +- Documentation/merge-config.txt | 2 +- contrib/completion/git-completion.bash | 2 +- git-mergetool--lib.sh | 24 ++++++++++++++++++++++-- 5 files changed, 26 insertions(+), 6 deletions(-)diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh@@ -263,6 +266,23 @@ run_merge_tool () { status=1 fi ;; + araxis) + if merge_mode; then
Here this is missing: touch "$BACKUP" I had already mentioned it in a reply to your mail from May 03, maybe you have overseen it. But looking in my sent-mail I just noticed that my suggestion had an off-by-one-line error. Now it is correct.
+ if $base_present; then + "$merge_tool_path" -wait -merge -3 -a1 \ + "$BASE" "$LOCAL" "$REMOTE" "$MERGED" \ + >/dev/null 2>&1 + else + "$merge_tool_path" -wait -2 \ + "$LOCAL" "$REMOTE" "$MERGED" \ + >/dev/null 2>&1 + fi + check_unchanged + else + "$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" \ + >/dev/null 2>&1 + fi + ;; *) merge_tool_cmd="$(get_merge_tool_cmd "$1")" if test -z "$merge_tool_cmd"; then