summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-03 17:27:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-03 17:27:22 (GMT)
commitf66a5bd9236b19288ad39387ec519a11d65b513d (patch)
tree4b8a6b9db432da1fd75c59c88c0aa9ecf7f083ae /builtin/merge.c
parent90f7b16b3adc78d4bbabbd426fb69aa78c714f71 (diff)
parentc9a014e38e5e2c2fb73b2e971705b320d517c65c (diff)
downloadgit-f66a5bd9236b19288ad39387ec519a11d65b513d.zip
git-f66a5bd9236b19288ad39387ec519a11d65b513d.tar.gz
git-f66a5bd9236b19288ad39387ec519a11d65b513d.tar.bz2
Merge branch 'mm/readme-markdown'
Fix a few broken links in README.md and also teach rpmbuild that there is no README. * mm/readme-markdown: README.md: don't take 'commandname' literally git.spec.in: use README.md, not README
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions