7 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
adam	c5888a964f	improve conflict debugging	2011-11-09 23:15:14 +00:00
adam	4ea5f396f9	ignore anything in .cvsignore	2011-11-09 23:15:14 +00:00
adam	859401f1cd	hack stow to ignore CVS/ dirs	2011-11-09 23:15:13 +00:00
Adam Spiers	d2e9969efb	Refactor Conflict()	2011-11-09 23:15:13 +00:00
Adam Spiers	ce93936919	Unexpand CVS keywords.	2011-11-09 22:56:17 +00:00
Adam Spiers	502cee75a5	Import version 1.3.3	2011-11-09 22:39:32 +00:00
Adam Spiers	3fff521fa1	Import version 1.3.2	2011-11-09 22:38:16 +00:00