summaryrefslogtreecommitdiff
path: root/t/t6031-merge-recursive.sh
AgeCommit message (Expand)Author
2013-11-26test: make FILEMODE a lazy prereqJonathan Nieder
2010-09-04Merge branch 'ab/test-2'Junio C Hamano
2010-08-18tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.shÆvar Arnfjörð Bjarmason
2010-08-18merge-recursive: Fix multiple file rename across D/F conflictElijah Newren
2010-08-18t6031: Add a testcase covering multiple renames across a D/F conflictElijah Newren
2009-03-22Skip tests that fail if the executable bit is not handled by the filesystemJohannes Sixt
2009-03-19test-lib: Introduce test_chmod and use it instead of update-index --chmodJohannes Sixt
2008-05-21Fix t6031 on filesystems without working exec bitAlex Riesen
2008-03-15Redo "add test_cmp function for test scripts"Junio C Hamano
2008-03-14merge-recursive: handle file mode changesClemens Buchacher