aboutsummaryrefslogtreecommitdiff
path: root/trailer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-04 10:20:59 +0900
committerJunio C Hamano <gitster@pobox.com>2017-06-04 10:20:59 +0900
commit34a75ccb1dade147f404c0841c3f1ec777c0a97a (patch)
tree510b420cb094401461673c76cf4117cfa2f31b74 /trailer.c
parent0501b7e78564d11e87d228f7ffdbdb4b147145e3 (diff)
parente294e8959fea043225a023f981121540b14b08cd (diff)
downloadgit-34a75ccb1dade147f404c0841c3f1ec777c0a97a.tar.gz
git-34a75ccb1dade147f404c0841c3f1ec777c0a97a.tar.xz
Merge branch 'jc/apply-fix-mismerge' into maint
Mismerge fix. * jc/apply-fix-mismerge: apply.c: fix whitespace-only mismerge
Diffstat (limited to 'trailer.c')
0 files changed, 0 insertions, 0 deletions