stop cmupdate on unresolved git conflicts in 140.00beta01 When cmupdate's stash pop conflicted, tracked files such as centmin.sh were left with conflict markers, so centmin.sh no longer ran. Later cmupdate runs could not stash or fast-forward but...