summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-08 14:29:13 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-08 14:29:13 -0700
commitb0fbcf0003d87c050a55434eaf74a48ad78cb2a9 (patch)
treefd0a1728fc4b6773ab431fd5c187aa3dc67a15c1 /Documentation/technical
parentMerge branch 'pb/opt-cmdmode-doc' (diff)
parentDocumentation: git diff --check detects conflict markers (diff)
downloadtgif-b0fbcf0003d87c050a55434eaf74a48ad78cb2a9.tar.xz
Merge branch 'oa/doc-diff-check'
A minor documentation update. * oa/doc-diff-check: Documentation: git diff --check detects conflict markers
Diffstat (limited to 'Documentation/technical')
0 files changed, 0 insertions, 0 deletions