projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eff7c32 6b44577)
Merge branch 'jc/maint-mergetool-read-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:53:39 +0000 (21:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:53:39 +0000 (21:53 -0700)
* jc/maint-mergetool-read-fix:
  mergetool: check return value from read


Trivial merge
Git—the stupid content tracker