Allow merging when there are remaining unstaged changes

[adam-ce]

Edit from @JetpackDuba

ah, my merge tool (kdiff3) keeps a file_with_conflict.cpp.orig file. after deleting it i the merge button gets enabled.

i guess this could be a feature to keep the repository clean, but imo it's not intuitive. at least there should be an information why the button is disabled :)

* i tend to keep such files around for a few days until i'm sure everything is ok.

Original:

Describe the bug I pulled and had to merge due to conflicts. After merging with git mergetool (from command line), it happened, that no additional files needed to be staged (because merging resulted in a choosing the local version everywhere). it was not possible to complete the merge in nuro.

To Reproduce Steps to reproduce the behavior:

1. Create a merge conflict
2. select local version everywhere
3. try to commit. the merge/commit button is greyed out

Expected behavior the merge button is active, and completes the merge

Desktop (please complete the following information):

• OS: Kubuntu 22.04
• Version 1.2.1 (from flathub)