Merge branch 'nd/magic-pathspec' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:21:34 +0000 (11:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:21:34 +0000 (11:21 -0800)
commitc8b928d...700b581118a7a1beb957184fcbe57d06
treedeef37f...c08ddbe4b3424f499dd60785940805a9copy hash to clipboard (tree)
parent3e7b066...2229f45d633164beaeb8815b0973a9b4copy hash to clipboard (diff)
parent887c6c1...ba84da8d722b1528fe8cdde65d9f9860copy hash to clipboard (diff)
builtin/diff.c