Edward Thomson e47f859db9 Don't overwrite ~ files checking out conflicts ... If a D/F conflict or rename 2->1 conflict occurs, we write the file sides as filename~branchname. If a file with that name already exists in the working directory, write as filename~branchname_0 instead. (Incrementing 0 until a unique filename is found.)		2013-10-16 16:20:14 -04:00
..
binaryunicode.c	Add cl_repo_set_bool and cleanup tests	2013-03-22 14:27:56 -07:00
checkout_helpers.c	Add clar helpers for testing file equality	2013-09-17 09:31:46 -07:00
checkout_helpers.h	Add clar helpers for testing file equality	2013-09-17 09:31:46 -07:00
conflict.c	Don't overwrite ~ files checking out conflicts	2013-10-16 16:20:14 -04:00
crlf.c	More filtering tests including order	2013-09-17 09:31:46 -07:00
head.c	No such thing as an orphan branch	2013-09-17 09:50:30 +02:00
index.c	More cleanups to remove WIN assumptions	2013-10-03 15:16:06 -07:00
tree.c	Prevent checkout_tree when conflicts exist, clear NAME on checkout tree	2013-10-16 16:20:08 -04:00
typechange.c	use a longer string for dummy data in test to avoid conflicting w/ index	2013-04-17 17:21:17 -05:00