Merge branch 'sb/diff-orderfile-config'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:32:42 +0000 (10:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jan 2014 18:32:42 +0000 (10:32 -0800)
commit2da5cbd...51114569b1a25d9b73c0e2afffb30aa7
tree3aa0ed6...50b24d67c0f62e756412dc2cd25e992dcopy hash to clipboard (tree)
parentf8c2e3f...7133e82b1df9c4cc806ba5d67670e425copy hash to clipboard (diff)
parent6d8940b...62adc5e43068868109dffe1b9bff7f78copy hash to clipboard (diff)
diff.c
diffcore-order.c