Sean Dague d15fd0647e make merge conflict changes black ...

instead of using the red dot to be all fails, use a black dot to
represent a change which has a merge conflict. Then it's clearer
when something it off the subway map, why it is, without having
to mouse over the circle (which few people knew about).

Change-Id: Ia44292fa553538e8924993f92a7177dfae34111f

2014-01-11 19:00:44 -05:00

355 B

16x16px

Raw History