| commit | beeeb45493332f38de2a3b58120c5bebb5863577 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Thu, 5 Aug 2010 11:13:04 +0000 (5 06:13 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Aug 2010 16:20:00 +0000 (6 09:20 -0700) | ||
| tree | cbee01b0038ca689c309580ef6e3302f62b9c266 | treesnapshot (tar.gz zip) |
| parent | d347cee4deda2e740f3c9e0046a86b46debdaeb8 | commitdiff |
t6038 (merge.renormalize): check that it can be turned off
An unusual sort of person (not me) may even enjoy the conflicts
from line-ending changes. But more importantly, it is useful to
document that behavior so we can more easily notice if it changes
in an uncontrolled way while no one is watching.
Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
An unusual sort of person (not me) may even enjoy the conflicts
from line-ending changes. But more importantly, it is useful to
document that behavior so we can more easily notice if it changes
in an uncontrolled way while no one is watching.
Cc: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t6038-merge-text-auto.sh | diffblobblamehistory |