Added git path settings and GitException.
Added rollback when initializing merge without valid git.exe path.