summaryrefslogtreecommitdiff
path: root/t/t6031-merge-recursive.sh
AgeCommit message (Expand)AuthorFilesLines
2010-08-18merge-recursive: Fix multiple file rename across D/F conflictLibravatar Elijah Newren1-1/+1
2010-08-18t6031: Add a testcase covering multiple renames across a D/F conflictLibravatar Elijah Newren1-0/+31
2009-03-22Skip tests that fail if the executable bit is not handled by the filesystemLibravatar Johannes Sixt1-0/+13
2009-03-19test-lib: Introduce test_chmod and use it instead of update-index --chmodLibravatar Johannes Sixt1-7/+2
2008-05-21Fix t6031 on filesystems without working exec bitLibravatar Alex Riesen1-2/+5
2008-03-15Redo "add test_cmp function for test scripts"Libravatar Junio C Hamano1-1/+1
2008-03-13merge-recursive: handle file mode changesLibravatar Clemens Buchacher1-0/+49