summaryrefslogtreecommitdiff
path: root/t/t6031-merge-recursive.sh
Commit message (Expand)AuthorAgeFilesLines
* 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