Added git-trial-merge, removed git-sh