#598250 merge-octopus: conflicts have ugly labels

Package:
git
Source:
git
Description:
fast, scalable, distributed revision control system
Submitter:
Jonathan Nieder
Date:
2011-02-03 21:12:36 UTC
Severity:
minor