changed the default temp directory to be /tmp/conflictClient
changed the default temp directory to be /tmp/conflictClient

SoftwareEngineeringToolDemos/FSE-2011-Crystal,SoftwareEngineeringToolDemos/FSE-2011-Crystal,KaranDagar/FSE-2011-Crystal---old,KaranDagar/crystalvc,brunyuriy/crystalvc,brunyuriy/crystalvc,KaranDagar/FSE-2011-Crystal---old,KaranDagar/crystalvc,SoftwareEngineeringToolDemos/FSE-2011-Crystal