summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-16 02:51:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-16 02:51:59 (GMT)
commitafc5f2ce63be2a51b1f87467065e47c398468c9e (patch)
tree5965af2e5aba72677949a6bde615a0934bf290b1 /builtin/am.c
parent5cea6ffdf20b99388821fa1bc279da06835f5a0c (diff)
parente294e8959fea043225a023f981121540b14b08cd (diff)
downloadgit-afc5f2ce63be2a51b1f87467065e47c398468c9e.zip
git-afc5f2ce63be2a51b1f87467065e47c398468c9e.tar.gz
git-afc5f2ce63be2a51b1f87467065e47c398468c9e.tar.bz2
Merge branch 'jc/apply-fix-mismerge'
* jc/apply-fix-mismerge: apply.c: fix whitespace-only mismerge
Diffstat (limited to 'builtin/am.c')
0 files changed, 0 insertions, 0 deletions