git - added merge indicator to prompt.