Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
[feature] different icon for merge conflict deleted files #479
When having conflicts like this:
The icon in "unmerged" is the same as an existing file. Selecting it in status pane shows an empty preview. Please change the icon to a deleted file like in "unstaged".