Joey Hess 751f496c11 add test case & fix conflict resolution bug on Windows & FAT ... Fix bug in automatic merge conflict resolution code when used on a filesystem not supporting symlinks, which resulted in it losing track of the symlink bit of annexed files. This was the underlying bug that was causing another test to fail, which got worked around in 1c997fd08c. I've chosen to keep 2 separate test cases since the old test case only detected the problem accidentially. Test suite passes on FAT & in windows, as well as on proper unix systems. This commit was sponsored by Ellis Whitehead.		2014-02-04 17:24:12 -04:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
changelog	add test case & fix conflict resolution bug on Windows & FAT	2014-02-04 17:24:12 -04:00
compat
control	Revert "temporarily revert tasty-rerun support for this release"	2014-01-27 14:22:44 -04:00
copyright	copyright year	2014-01-08 16:29:15 -04:00
doc-base
menu	fixups	2013-05-15 22:48:27 -04:00
NEWS	prep release	2013-10-02 16:13:45 -04:00
rules	re-enable test suite	2013-12-30 14:39:29 -04:00