projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba9a247 6b44577)
Merge branch 'jc/maint-mergetool-read-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:42:38 +0000 (14:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:42:38 +0000 (14:42 -0700)
* jc/maint-mergetool-read-fix:
  mergetool: check return value from read


Trivial merge
Git—the stupid content tracker