git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48adfa1 30211fb)
Merge branch 'oa/doc-diff-check' into maint
authorJunio C Hamano <redacted>
Fri, 15 Apr 2016 01:37:14 +0000 (18:37 -0700)
committerJunio C Hamano <redacted>
Fri, 15 Apr 2016 01:37:14 +0000 (18:37 -0700)
A minor documentation update.

* oa/doc-diff-check:
  Documentation: git diff --check detects conflict markers


Trivial merge
git clone https://git.99rst.org/PROJECT