Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800)
* maint:
difftool: provide basename to external tools
git-difftool.txt: correct the description of $BASE and describe $MERGED

1  2 
Documentation/git-difftool.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-difftool.txt
Simple merge