Merge branch 'ah/diff-files-ours-theirs-doc'