fix: editor command splitting and merge conflict detection#2

sulthonzh wants to merge 1 commit into

mainsulthonzh/git-conflicts:mainfrom

fix/editor-merge-detectionsulthonzh/git-conflicts:fix/editor-merge-detectionCopy head branch name to clipboard