]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81dbbf7 f8750a0)
Merge branch 'jc/maint-mergetool-style-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 22:54:25 +0000 (15:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Sep 2012 22:54:25 +0000 (15:54 -0700)
* jc/maint-mergetool-style-fix:
  mergetool: style fixes


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