Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[feature] different icon for merge conflict deleted files #479

Closed
sthalik opened this issue Jul 20, 2015 · 0 comments
Closed

[feature] different icon for merge conflict deleted files #479

sthalik opened this issue Jul 20, 2015 · 0 comments
Labels
help wanted usability

Comments

@sthalik
Copy link
Contributor

sthalik commented Jul 20, 2015

When having conflicts like this:

CONFLICT (modify/delete): ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp deleted in HEAD and modified in unstable. Version unstable of ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp left in tree.

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".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
help wanted usability
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@davvid @sthalik