search multiple locations for tortisemerge should help fix #2