From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 17 Dec 2010 00:36:03 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~28
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=38a5932be8a8f0b0bd3bb949bdc5258d9c753f15;hp=--cc;p=git.git

Merge branch 'maint'

* maint:
  difftool: provide basename to external tools
  git-difftool.txt: correct the description of $BASE and describe $MERGED
---

38a5932be8a8f0b0bd3bb949bdc5258d9c753f15