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.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
t
/
t6031-merge-recursive.sh
Age
Commit message (
Expand
)
Author
2015-10-27
t6031: generalize for recursive and resolve strategies
Jeff King
2015-10-27
t6031: move triple-rename test to t3030
Jeff King
2014-09-29
Merge branch 'sb/t6031-typofix'
Junio C Hamano
2014-09-22
t6031-test-merge-recursive: do not forget to add file to be committed
Stefan Beller
2013-11-27
test: make FILEMODE a lazy prereq
Jonathan Nieder
2010-09-04
Merge branch 'ab/test-2'
Junio C Hamano
2010-08-18
tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
Ævar Arnfjörð Bjarmason
2010-08-18
merge-recursive: Fix multiple file rename across D/F conflict
Elijah Newren
2010-08-18
t6031: Add a testcase covering multiple renames across a D/F conflict
Elijah Newren
2009-03-22
Skip tests that fail if the executable bit is not handled by the filesystem
Johannes Sixt
2009-03-19
test-lib: Introduce test_chmod and use it instead of update-index --chmod
Johannes Sixt
2008-05-21
Fix t6031 on filesystems without working exec bit
Alex Riesen
2008-03-15
Redo "add test_cmp function for test scripts"
Junio C Hamano
2008-03-14
merge-recursive: handle file mode changes
Clemens Buchacher