OSDN Git Service

(root) / git-core / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7929674 35d62bb)
Merge branch 'jn/mergetools-examdiff'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 21:12:36 +0000 (14:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 21:12:36 +0000 (14:12 -0700)
"git mergetools" learned to drive ExamDiff.

* jn/mergetools-examdiff:
  mergetools: add support for ExamDiff
  mergetools: create mergetool_find_win32_cmd() helper function for winmerge


Trivial merge
Mirror of official git.git repository
About OSDN
Find Software
Develop Software
Help