Joey Hess 2a297dd6d1 on second thought, don't change sync to exit nonzero on successful conflicted merge resolution ... For one thing, that breaks the test suite. May revisit later.		2013-11-14 14:36:48 -04:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
changelog	on second thought, don't change sync to exit nonzero on successful conflicted merge resolution	2013-11-14 14:36:48 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	depend on git 1.8.4	2013-11-12 15:14:35 -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