![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800) | ||
| commit | 38a5932be8a8f0b0bd3bb949bdc5258d9c753f15 | |
| tree | 988476312dea85d849b00b42b812f626bd7dbf29 | tree | snapshot |
| parent | cf7a64b54afe28ff61b362abc04399de383977e0 | commit | diff |
| parent | 4a689afb030c1cd5aa1c141db94bbf9dde42f05e | commit | diff |
Merge branch 'maint'
* maint:
difftool: provide basename to external tools
git-difftool.txt: correct the description of $BASE and describe $MERGED
* maint:
difftool: provide basename to external tools
git-difftool.txt: correct the description of $BASE and describe $MERGED
| Documentation/git-difftool.txt | diff1 | | diff2 | | blob | history |