From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Nov 2014 18:16:54 +0000 (-0800)
Subject: Merge branch 'da/difftool'
X-Git-Tag: v2.2.0-rc3~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3f78278beb9792368de7edbbb031c3a88e0038a1?ds=inline;hp=-c

Merge branch 'da/difftool'

Fix-up to a new feature in 'master'.

* da/difftool:
difftool: honor --trust-exit-code for builtin tools
---

3f78278beb9792368de7edbbb031c3a88e0038a1
diff --combined git-mergetool--lib.sh
index a40d3dfea6,cce4f8c494..2b6635130a
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@@ -221,6 -221,7 +221,7 @@@ run_merge_tool () 
  	else
  		run_diff_cmd "$1"
  	fi
+ 	status=$?
  	return $status
  }
  
@@@ -250,7 -251,7 +251,7 @@@ list_merge_tool_candidates () 
  			tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
  		fi
  		tools="$tools gvimdiff diffuse diffmerge ecmerge"
 -		tools="$tools p4merge araxis bc3 codecompare"
 +		tools="$tools p4merge araxis bc codecompare"
  	fi
  	case "${VISUAL:-$EDITOR}" in
  	*vim*)