| commit | 049540435fa5f7f583b8f5af257322b17eac7375 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Jun 2008 22:37:21 +0000 (26 15:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 27 Jun 2008 05:07:54 +0000 (26 22:07 -0700) | ||
| tree | 501fceeeb949f29edeac20f6182635ca4323adaa | treesnapshot (tar.gz zip) |
| parent | 877f23ccb88227203f2576abdfb5d1c15925fcb3 | commitdiff |
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>
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>
| diff.c | diffblobblamehistory | |
| t/t4017-diff-retval.sh | diffblobblamehistory |