Add splice as git mergetool
Enable git rerere