Merge branch 'ah/diff-files-ours-theirs-doc' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Apr 2017 05:36:29 +0000 (22:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Apr 2017 05:36:29 +0000 (22:36 -0700)
commita4f80f0c3fdd323d21db3e911a0a53ebf11cfa13
tree56a9048cfc14bb84543a0297bec096cc290e2ffd
parent6555be6bab02fec545d3551007fefc94097fd1ff
parent47242cd1037483896bb2b042e6a02c66b65b07d6
Merge branch 'ah/diff-files-ours-theirs-doc' into next

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.