summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorLibravatar Ori Avtalion <ori@avtalion.name>2016-03-29 21:59:45 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-29 13:14:50 -0700
commit30211fb68d64c2b3852da5b5f846d8d52d70c9c1 (patch)
treef01ef44625d104c2e8d6507c5f8e5f60f2339352 /submodule.c
parentGit 2.6.6 (diff)
downloadtgif-30211fb68d64c2b3852da5b5f846d8d52d70c9c1.tar.xz
Documentation: git diff --check detects conflict markers
Signed-off-by: Ori Avtalion <ori@avtalion.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
0 files changed, 0 insertions, 0 deletions