summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-21 10:49:26 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-21 10:49:26 -0700
commite63f87a6f7a4e55f50e67b112f26d9a1e4e7f3ab (patch)
tree613c9ce697b049f70961c26761230f54ec47b249 /notes-merge.h
parent6e89b37d34f9a58182192664f304c15f525be4d2 (diff)
parent855726395342441808eff5e4e9ad9a2b9254edbc (diff)
downloadgit-e63f87a6f7a4e55f50e67b112f26d9a1e4e7f3ab.tar.gz
Merge branch 'jc/apply-blank-at-eof-fix' into maint
* jc/apply-blank-at-eof-fix: apply --whitespace=error: correctly report new blank lines at end
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions