10 Commits

Author	SHA1	Message	Date
Matt Nadareski	eec433aad9	Fix some issues with merging caused by incorrect boolean expressions	2016-03-24 20:56:04 -07:00
Matt Nadareski	817262e113	Add check for import-only	2016-03-24 17:46:47 -07:00
Matt Nadareski	b1df50aab9	Enable multiple source/system merging	2016-03-24 17:38:08 -07:00
Matt Nadareski	731af58492	Add more preview code	2016-03-24 14:35:48 -07:00
Matt Nadareski	0bcaf3c67f	Add more peeks into a future change.	2016-03-24 14:23:12 -07:00
Matt Nadareski	5a012ff512	A preview of things to come...	2016-03-24 14:12:22 -07:00
Matt Nadareski	551eaa0187	Variable cleanup for future changes	2016-03-24 14:07:32 -07:00
Matt Nadareski	a30ebed20c	Make some renaming-specific changes	2016-03-24 13:27:57 -07:00
Matt Nadareski	18ab82846e	Add ability to disable renaming of sets	2016-03-24 13:23:13 -07:00
Matt Nadareski	3c740a3f6b	Move core functionality to Core folder	2016-03-24 12:49:10 -07:00