Joey Hess e227e8f683 sync: Fix automatic resolution of merge conflicts where one side is an annexed file, and the other side is a non-annexed file, or a directory. ... Note that this case is only fully automatically resolved in direct mode. In indirect mode, git merge moves the file to file~HEAD, and replaces it with the directory, and leaves the file in unmerged state, and sync doesn't yet change that.		2013-10-16 14:56:40 -04:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
changelog	sync: Fix automatic resolution of merge conflicts where one side is an annexed file, and the other side is a non-annexed file, or a directory.	2013-10-16 14:56:40 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	Revert "use vector in local status", which was not an improvement	2013-10-07 04:06:10 -04:00
copyright	Allow public-key encryption of file content.	2013-09-03 14:34:16 -04:00
doc-base	Add doc-base file. Closes: #621408	2011-04-06 21:57:22 -04:00
menu	fixups	2013-05-15 22:48:27 -04:00
NEWS	prep release	2013-10-02 16:13:45 -04:00
rules	rename var	2013-05-10 18:52:35 -04:00