diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:54 +0900 |
| commit | da36be5f08252cdcbfe37710990dea4c4025567a (patch) | |
| tree | 01d0166ced1918c3a91bbe81895faaf45754e722 /notes-utils.h | |
| parent | 03f78e143474de2246ab06dbc26bc41245bc70f9 (diff) | |
| parent | 6ceb658c9905cad2436810370c6590fc260a6b64 (diff) | |
Merge branch 'br/mergetools-guiffy'
"git mergetools" learned talking to guiffy.
* br/mergetools-guiffy:
mergetools: add support for guiffy
Diffstat (limited to 'notes-utils.h')
0 files changed, 0 insertions, 0 deletions