git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04d0eb8 67ed84f)
Merge branch 'rt/doc-merge-file-diff3'
authorJunio C Hamano <redacted>
Fri, 30 Aug 2013 17:08:23 +0000 (10:08 -0700)
committerJunio C Hamano <redacted>
Fri, 30 Aug 2013 17:08:23 +0000 (10:08 -0700)
* rt/doc-merge-file-diff3:
  Documentation/git-merge-file: document option "--diff3"


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