]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8ef69f 7c147b7)
Merge branch 'fc/mergetools-vimdiff3'
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000 (12:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jun 2014 19:06:43 +0000 (12:06 -0700)
* fc/mergetools-vimdiff3:
  mergetools: add vimdiff3 mode


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