Improve output `gl status` for conflicts of type (modified - removed)

[spderosso]

trafficstars

If file foo was modified in branch a and at the same time removed in branch b, then after doing a gl {rebase, merge} b gl status will note the conflict but just say:

 foo (with conflicts)

It should say something more informative like

 foo (with conflicts -- modified in a, removed in b)