Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 00:10:08 +0000 (17:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 00:10:08 +0000 (17:10 -0700)
commit106db88...b791efb7f39f3b2f8553236ba792a89e
tree4589463...8d7a3f2f42bfc1bb0ef72d0ad7c852a3copy hash to clipboard (tree)
parent7f31456...fe20e324e8db1a7c233e43ca4e3683f0copy hash to clipboard (diff)
parentdb3a954...9cb873c302051b4b2b693be5ba248c13copy hash to clipboard (diff)
Documentation/diff-options.txt
Makefile