Merge branch 'jc/conflict-marker-size'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:46 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:46 +0000 (14:50 -0700)
commit3f3f8d9...09cdb6810e848d82583749e6080d2167
tree5f85fe2...add68b68d375c0c74f0791f811f4692ccopy hash to clipboard (tree)
parentf9bdf9b...102bd848c7a3eabff2ba5af63828de54copy hash to clipboard (diff)
parenta757c64...ee78ae21c9e8ac66dcc52e361c15c7d2copy hash to clipboard (diff)
diff.c
t/t4017-diff-retval.sh