summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Dennis Kaarsemaker <dennis@kaarsemaker.net>2016-04-27 19:54:35 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-27 13:25:44 -0700
commitef642ff07c6ca2c71787385ec554e826b3401216 (patch)
tree2296b4c6646e23ca6b8495a1ff35384e54338853 /builtin/merge-ours.c
parentMakefile: stop pretending to support rpmbuild (diff)
downloadtgif-ef642ff07c6ca2c71787385ec554e826b3401216.tar.xz
Makefile: remove dependency on git.spec
ab214331 (Makefile: stop pretending to support rpmbuild, 2016-04-04) dropped support for rpmbuild using our own specfile by removing git.spec.in, but forgot to remove the dependency of the dist target on git.spec. Signed-off-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions