summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-12-16 20:02:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-16 21:04:47 (GMT)
commit0ea7d5b6f8e258fdec067edf1b136ed87c5670e5 (patch)
treeb233a72c921579a9e573663ad6abc0d5a221073e /ll-merge.c
parentee7fb0b1d433cbb433d2ed5cd9d8738023836b27 (diff)
downloadgit-0ea7d5b6f8e258fdec067edf1b136ed87c5670e5.zip
git-0ea7d5b6f8e258fdec067edf1b136ed87c5670e5.tar.gz
git-0ea7d5b6f8e258fdec067edf1b136ed87c5670e5.tar.bz2
diff.c: fix some recent whitespace style violations
These were introduced by ee7fb0b. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions