]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fd63ca 3e4f237)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.