| commit | 7203bafa88ff0a4f8702b0eee38bc36d7e542a81 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Apr 2017 04:37:16 +0000 (19 21:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Apr 2017 04:37:16 +0000 (19 21:37 -0700) | ||
| tree | 56df1189eed5ed0464d2d98c8ff6ae42e992ac54 | treesnapshot (tar.gz zip) |
| parent | 74a74beee9676a21c089f569b75d386398a4867b | commitdiff |
| parent | 47242cd1037483896bb2b042e6a02c66b65b07d6 | commitdiff |
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.
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.