summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-03 00:32:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-03 00:32:29 -0800
commit281907574ca420cc9a800190509adbf89bf9a2d1 (patch)
treedc338b120a9447be2e97be7b1505ea3e8f9d4f9c /ll-merge.c
parentMerge branch 'maint-1.6.0' into maint (diff)
parentgrep: pass -I (ignore binary) down to external grep (diff)
downloadtgif-281907574ca420cc9a800190509adbf89bf9a2d1.tar.xz
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: grep: pass -I (ignore binary) down to external grep
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions