diff options
| author | Torsten Bögershausen <tboegi@web.de> | 2015-10-10 06:23:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-12 15:07:45 -0700 |
| commit | 710b4e8a167f6fe968d2f4f540be5baa3ddcfdd6 (patch) | |
| tree | 51197a5e6f60fd7aaa9001d4f3afb13e4a519720 /builtin/merge-recursive.c | |
| parent | 8eeab92f02f3d9382572f0a604535c2b134c6763 (diff) | |
| download | git-710b4e8a167f6fe968d2f4f540be5baa3ddcfdd6.tar.gz git-710b4e8a167f6fe968d2f4f540be5baa3ddcfdd6.tar.xz | |
t0027: improve test for not-normalized files
When a text file with mixed line endings is commited into the repo,
it is called "not normalized" (or NNO) in t0027. The existing test
case using repoMIX did not fully test all combinations: (Especially
when core.autocrlf = true) Files with NL are not converted at
commit, but at checkout, so a warning NL->CRLF is given. Files with
CRLF are not converted at all (so no warning will be given), unless
they are marked as "text" or "auto".
Remove repoMIX introduced in commit 8eeab92f02, and replace it with
a combination of NNO tests.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions