Andrew's git / gitweb.git / diff
?
Merge branch 'da/mergetool-winmerge'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Jun 2015 19:45:14 +0000 (12:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Jun 2015 19:45:14 +0000 (12:45 -0700)
"git mergetool" learned to drive WinMerge as a backend.

* da/mergetool-winmerge:
mergetools: add winmerge as a builtin tool
mergetool--lib: set IFS for difftool and mergetool

No differences found