From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Dec 2010 05:43:24 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~58
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=987cddb87165104f919f3287f393191042955364;p=git.git

Merge branch 'master' into next

* master:
  Update draft release notes to 1.7.4
  difftool: provide basename to external tools
  git-difftool.txt: correct the description of $BASE and describe $MERGED
---

987cddb87165104f919f3287f393191042955364