Joey Hess 4a847cdc08 finish fixing direct mode merge bug involving unstaged local files ... Added test cases for both ways this can happen, with a conflict involving a file, or a directory. Cleaned up resolveMerge to not touch the work tree in direct mode, which turned out to be the only way to handle things.. And makes it much nicer. Still need to run test suite on windows.		2014-03-04 02:03:15 -04:00
..
tests	Debian: Run the builtin test suite as an autopkgtest.	2013-08-15 15:49:19 +02:00
changelog	finish fixing direct mode merge bug involving unstaged local files	2014-03-04 02:03:15 -04:00
compat	debhelper v9	2012-01-15 14:53:38 -04:00
control	depend on warp-tls.. at least for now	2014-02-28 21:37:33 -04:00
copyright	copyright year	2014-01-08 16:29:15 -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