Comment 4 for bug 529958

This is partial fixed. The retry now correctly shows only when there is an error.

I am going to keep this bug open for the feature request to show the option to show the option to open the conflicts window, or to remerge. I can't use the same method that the other info widgets, like when the branch is out of date, or the when the working tree contains uncommitted changes, use. This requires a command to raise an error, which correctly does not happen when there are conflicts. In order to detect conflicts, we need to look for a return code of 1. But for diff (and may be others), a return code of on means something else, so this needs to be command specific, but should probable exclude diff, rather than include, as the number of commands that do merges is numerious, e.g. update, pull (with wt), rebase, etc...