Merge branch 'maint'
* maint: difftool: provide basename to external tools git-difftool.txt: correct the description of $BASE and describe $MERGED
Junio C Hamano committed
Dec 16, 2010 at 16:36 UTC
38a5932be8a8f0b0bd3bb949bdc5258d9c753f15
No changes.