When a merge conflic is commited, gitg taints the status
Submitted by Aigars Mahinovs
Link to original bug (#603585)
Description
Try this:
- From the command line, pull from a remote repo where there is a merge conflict
- From command line launch 'git mergetool' to resolve the conflict
If at this point you would use gitg to commit, the merge will not be resolved. If at this point you run 'git commit' from the command line, the merge will be resolved.
It would be nice if in addition to pull support (#603584) gitg would be able to call meld (or another mergetool) and then handle the merged commit correctly, but at least it should work as well as the 'git commit' from the command line.
Version: git master