BitBasher's Git Repositories

author	Junio C Hamano <gitster@pobox.com>
	Tue, 18 Nov 2014 18:16:54 +0000 (10:16 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Tue, 18 Nov 2014 18:16:55 +0000 (10:16 -0800)
commit	3f78278beb9792368de7edbbb031c3a88e0038a1
tree	42d7a2d7309fffd683ddd62b507ae1d65bea1a64	tree \| snapshot
parent	ea4f93eb99038329bbd692c5c8246e5ec8c11da9	commit \| diff
parent	99474b6340dbcbe58f6c256fdee231cbadb060f4	commit \| diff

Merge branch 'da/difftool'

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

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