summaryrefslogtreecommitdiff
path: root/t/t6031-merge-recursive.sh
Commit message (Expand)AuthorAgeFilesLines
* t6031: generalize for recursive and resolve strategiesJeff King2015-10-261-56/+0
* t6031: move triple-rename test to t3030Jeff King2015-10-261-31/+0
* Merge branch 'sb/t6031-typofix'Junio C Hamano2014-09-291-0/+1
|\
| * t6031-test-merge-recursive: do not forget to add file to be committedsb/t6031-typofixStefan Beller2014-09-221-0/+1
* | test: make FILEMODE a lazy prereqJonathan Nieder2013-11-261-1/+0
|/
* Merge branch 'ab/test-2'Junio C Hamano2010-09-041-5/+1
|\
| * tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.shÆvar Arnfjörð Bjarmason2010-08-181-5/+1
* | merge-recursive: Fix multiple file rename across D/F conflictElijah Newren2010-08-181-1/+1
* | t6031: Add a testcase covering multiple renames across a D/F conflictElijah Newren2010-08-181-0/+31
|/
* Skip tests that fail if the executable bit is not handled by the filesystemJohannes Sixt2009-03-221-0/+13
* test-lib: Introduce test_chmod and use it instead of update-index --chmodJohannes Sixt2009-03-191-7/+2
* Fix t6031 on filesystems without working exec bitAlex Riesen2008-05-211-2/+5
* Redo "add test_cmp function for test scripts"Junio C Hamano2008-03-151-1/+1
* merge-recursive: handle file mode changesClemens Buchacher2008-03-131-0/+49
View Lorry Controller Status