diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-06-26 15:37:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-26 22:07:54 -0700 |
| commit | 049540435fa5f7f583b8f5af257322b17eac7375 (patch) | |
| tree | 501fceeeb949f29edeac20f6182635ca4323adaa /t/.gitattributes | |
| parent | Teach "diff --check" about new blank lines at end (diff) | |
| download | tgif-049540435fa5f7f583b8f5af257322b17eac7375.tar.xz | |
diff --check: detect leftover conflict markers
This teaches "diff --check" to detect and complain if the change
adds lines that look like leftover conflict markers.
We should be able to remove the old Perl script used in the sample
pre-commit hook and modernize the script with this facility.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/.gitattributes')
0 files changed, 0 insertions, 0 deletions