Merge branch 'jk/diff-compact-heuristic'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jun 2016 22:26:06 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jun 2016 22:26:06 +0000 (15:26 -0700)
commite5f7675...4404592cf65e7c49b3594b195a324031
treec94786f...0cc5820f7526bd88cecde58940c94979copy hash to clipboard (tree)
parent45c0c21...b96ce45f05ffbe8600adf6ac65086415copy hash to clipboard (diff)
parent5580b27...af518bae30148edfd42cc8459d8da384copy hash to clipboard (diff)
Documentation/diff-config.txt
Documentation/diff-options.txt
diff.c