| commit | 30211fb68d64c2b3852da5b5f846d8d52d70c9c1 | |
| author | Ori Avtalion <ori@avtalion.name> | |
| Tue, 29 Mar 2016 18:59:45 +0000 (29 21:59 +0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Mar 2016 20:14:50 +0000 (29 13:14 -0700) | ||
| tree | f01ef44625d104c2e8d6507c5f8e5f60f2339352 | treesnapshot (tar.gz zip) |
| parent | e46579643d56162299b1756b70d418005351b256 | commitdiff |
Documentation: git diff --check detects conflict markers
Signed-off-by: Ori Avtalion <ori@avtalion.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ori Avtalion <ori@avtalion.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/diff-options.txt | diffblobblamehistory |