3 Commits

Author	SHA1	Message	Date
Jim Evins	7c945d6ba7	Added additional text merge backends.	2016-05-22 15:40:47 -04:00
Jim Evins	c7f02f027a	Moved Merge subsystem into merge namespace.	2016-05-22 14:38:59 -04:00
Jim Evins	b1e7a6507c	Moved Merge subsystem into its own subdirectory.	2016-05-22 13:01:48 -04:00