Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'fc/mergetools-vimdiff3'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000
(12:06 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000
(12:06 -0700)
* fc/mergetools-vimdiff3:
mergetools: add vimdiff3 mode
raw
|
combined
(merge:
b8ef69f
7c147b7
)
Trivial merge