]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03f78e1 6ceb658)
Merge branch 'br/mergetools-guiffy'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:54 +0000 (13:28 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Apr 2018 04:28:54 +0000 (13:28 +0900)
"git mergetools" learned talking to guiffy.

* br/mergetools-guiffy:
  mergetools: add support for guiffy


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