Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kirillov <max@max630.net>2014-06-29 02:04:45 +0400
committerJunio C Hamano <gitster@pobox.com>2014-07-01 01:07:48 +0400
commit6d49de414f9dc7a94503a3798dd745971669cebe (patch)
treebb7208685db08776a1031395da9b6babf23c81f7 /xdiff/xmerge.c
parent7fe683480124239ec0ab555c9b529e4c54707d7b (diff)
t6023-merge-file.sh: fix and mark as broken invalid tests
Tests "merge without conflict (missing LF at EOF" and "merge result added missing LF" are meaningless - the first one is identical to "merge without conflict" and the second compares results of those identical tests, which are always same. This has been so since their addition in ba1f5f3537. Probably "new4.txt" was meant to be used instead of "new2.txt". Unfortunately, the current merge-file breaks with new4 - conflict is reported. They also fail at that revision if fixed. Fix the file reference to "new4.txt" and mark the tests as failing - they look like legitimate expectations, just not satisfied at time being. Signed-off-by: Max Kirillov <max@max630.net> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions