From: Junio C Hamano Date: Thu, 20 Apr 2017 04:37:16 +0000 (-0700) Subject: Merge branch 'ah/diff-files-ours-theirs-doc' X-Git-Tag: v2.13.0-rc0~13 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7203bafa88ff0a4f8702b0eee38bc36d7e542a81 Merge branch 'ah/diff-files-ours-theirs-doc' 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. --- 7203bafa88ff0a4f8702b0eee38bc36d7e542a81