Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'br/mergetools-guiffy'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 25 Apr 2018 04:28:54 +0000
(13:28 +0900)
committer
Junio 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
raw
|
combined
(merge:
03f78e1
6ceb658
)
Trivial merge