Changeset 782 for git/branches/dmik/t/t6031-merge-recursive.sh

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• t/t6031-merge-recursive.sh (modified) (1 diff)

git/branches/dmik/t/t6031-merge-recursive.sh ¶

@@ -3 +3 @@
 test_description='merge-recursive: handle file mode'
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-prereq-FILEMODE.sh
 
 test_expect_success 'mode change in one branch: keep changed version' '