Merge branch 'rs/xdiff-hunk-with-func-line' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:24 +0000 (09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:24 +0000 (09:56 -0700)
commitfda65fa...b6e98b5b8ea8058bbeaa29d983f335cb
tree01a4d9e...1f591fea9d34e0e6bfd22991050b520dcopy hash to clipboard (tree)
parentdf5a925...23e627cd20ce11f570d418dfae2ac7d8copy hash to clipboard (diff)
parent6f8d9bc...b2c3694c62d14225976689c1e8c50fa5copy hash to clipboard (diff)
grep.c
t/t7810-grep.sh