index
:
git
main
maint
master
next
seen
todo
Git: sistema de control de versiones
mirror
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6038-merge-text-auto.sh
Age
Commit message (
Expand
)
Author
2020-08-03
merge: make merge.renormalize work for all uses of merge machinery
Elijah Newren
2020-08-03
t6038: remove problematic test
Elijah Newren
2020-08-03
t6038: make tests fail for the right reason
Elijah Newren
2016-07-12
merge: avoid "safer crlf" during recording of merge results
Junio C Hamano
2016-07-06
convert: unify the "auto" handling of CRLF
Torsten Bögershausen
2014-09-02
MinGW: update tests to handle a native eol of crlf
Brice Lambson
2011-01-09
t6038-*.sh: Pass the -b (--binary) option to sed on cygwin
Ramsay Jones
2010-10-03
Side-step sed line-ending "corruption" leading to t6038 failure.
Eric Sunshine
2010-08-06
t6038 (merge.renormalize): check that it can be turned off
Jonathan Nieder
2010-08-06
t6038 (merge.renormalize): try checkout -m and cherry-pick
Jonathan Nieder
2010-08-06
t6038 (merge.renormalize): style nitpicks
Jonathan Nieder
2010-07-02
Try normalizing files to avoid delete/modify conflicts when merging
Eyvind Bernhardsen
2010-07-02
Avoid conflicts when merging branches with mixed normalization
Eyvind Bernhardsen