![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Dec 2010 05:43:24 +0000 (21:43 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Dec 2010 05:43:24 +0000 (21:43 -0800) |
* 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
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
Trivial merge