From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Jul 2010 18:21:08 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68;p=git.git

Merge branch 'maint'

* maint:
  update-server-info: Shorten read_pack_info_file()
  Documentation: Explain git-mergetool's use of temporary files
---

c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68