git - added merge indicator to prompt.
git - added merge indicator to prompt.
Merge branch 'master' into sistemi