![[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) | ||
| commit | 987cddb87165104f919f3287f393191042955364 | |
| tree | ceedf72ea402755829e00fe71bd08e0dde837553 | tree | snapshot |
| parent | 3eda2970212539418ce615b784cdeeeae9b51a65 | commit | diff |
| parent | 1b9743462d9ef3c0e73a3c439de45c0c16b6c938 | commit | diff |
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
* 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