summaryrefslogtreecommitdiff
path: root/builtin-fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 12:16:46 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-20 12:16:46 -0800
commit27132ca85a74b65fe97cedab02f84f20050faa2d (patch)
treeb0ee6a720379cad8001eb11901db2f58a622bc45 /builtin-fmt-merge-msg.c
parent03c6e97f809e5b89089a2c689d6a319e8d471455 (diff)
parent34f3999206e8ea41b9e4cf48e30ab1149e01d8a5 (diff)
downloadgit-27132ca85a74b65fe97cedab02f84f20050faa2d.tar.gz
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5
* jm/maint-1.6.5-grep-NUL-terminate: grep: NUL terminate input from a file
Diffstat (limited to 'builtin-fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions