6 Commits (e1deb28e08b74973435825a61fffa9a9d4a2fd07)

Author	SHA1	Message	Date
Joey Hess	1dbb2632ef	another class of conflicts: subdir/file conflicts	2010-07-18 17:16:39 -04:00
Joey Hess	d6cb4436bd	2 more cases	2010-07-18 16:45:44 -04:00
Joey Hess	773db5a35e	avoid error if two source files render the same destination file ... There are two sub-caces. If both source files still exist, the winner that renders the destination file is undefined. If one source file is deleted and the other added, in a refresh, the new file will take over the destination file.	2010-07-18 16:28:39 -04:00
Joey Hess	a291f24be6	some other (similar) failure cases	2010-07-18 13:50:06 -04:00
Joey Hess	bfa4660df7	update	2010-07-17 13:30:08 -04:00
Joey Hess	4142308429	turning into complete source file conflict test suite	2010-07-17 13:24:40 -04:00