2 Commits

Author	SHA1	Message	Date
Marty Schoch	267811a6d2	cover another case in the merge	2014-04-25 09:44:07 -06:00
Marty Schoch	4affede801	added test for merge locations	2014-04-25 09:40:55 -06:00