Joey Hess 61a35de433 Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. ... I think this is a git behavior change, but have not checked to be sure. Conflict cruft used to look like $foo~HEAD, but now just $foo is left behind as conflict cruft. With test case.		2014-07-11 16:56:19 -04:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
changelog	Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files.	2014-07-11 16:56:19 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	network-conduit build dep in cabal was spuriious, remove	2014-07-07 12:31:27 -04:00
copyright	update for ddar special remote	2014-05-15 16:37:46 -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	re-enable test suite	2013-12-30 14:39:29 -04:00