Graphical issue with smerge difftool when a file exists only on one side

[Zwyx]

Hi all and thanks again for making Sublime Merge.

Version info

• OS: MX Linux 18.3 Continuum (based on Debian Stretch)
• Build: 2063

Description

smerge difftool is having a hard time when merging two branches, when a file exists only on one branch.

Steps to reproduce

1. Set up smerge difftool for git difftool, as describe here.

git config --global mergetool.smerge.cmd 'smerge mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"'
git config --global mergetool.smerge.trustExitCode true
git config --global merge.tool smerge

2. Create a new repository, two branches, one file in only one branch:

mkdir sublime-test
cd sublime-test
git init
echo test > test.md
git add test.md
git commit -m "Add test.md"
git checkout -b test-branch
rm test.md
git difftool master

Then answer yes to:

Viewing (1/1): 'test.md'
Launch 'smerge' [Y/n]?

Sublime Merge will first annonce that the file wasn't found, which is expected. However, after clicking OK, the merge tool opens with graphical problems (and the number of conflicts, displayed at the top, is a very large number).

Clicking cancel works and ends the problem.

Expected behaviour

No graphical issues.

Screenshots

[srbs]

related issues with deleted files during merge/conflict resolution: #55, #124