diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:29:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:29:13 -0700 |
commit | b0fbcf0003d87c050a55434eaf74a48ad78cb2a9 (patch) | |
tree | fd0a1728fc4b6773ab431fd5c187aa3dc67a15c1 /builtin/count-objects.c | |
parent | Merge branch 'pb/opt-cmdmode-doc' (diff) | |
parent | Documentation: git diff --check detects conflict markers (diff) | |
download | tgif-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 'builtin/count-objects.c')
0 files changed, 0 insertions, 0 deletions