Code Editor : git-merge-one-file