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
..
2013-12-05 18:38:04 +00:00
2013-09-06 13:29:04 -07:00
2013-12-06 15:17:28 -05:00
2013-10-21 10:17:48 -07:00
2012-11-12 18:58:07 +00:00
2013-05-17 17:21:21 +00:00
2013-05-20 20:40:03 +00:00
2012-11-10 23:50:17 +00:00
2014-01-08 16:26:21 +08:00