fix: remove extra '\n' when resolving conflicts using internal merge tool#2429

love-linger merged 1 commit into

sourcegit-scm:developsourcegit-scm/sourcegit:developfrom

cdammanintopix:fix_merge_extra_newlinecdammanintopix/sourcegit:fix_merge_extra_newlineCopy head branch name to clipboard