Andrew's git / gitweb.git / diff
?
Merge branch 'ah/diff-files-ours-theirs-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 04:37:16 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 04:37:16 +0000 (21:37 -0700)
The diff options "--ours", "--theirs" exist for quite some time.
But so far they were not documented. Now they are.

* ah/diff-files-ours-theirs-doc:
diff-files: document --ours etc.

Trivial merge