7.x-1.0
b0f19c37 · #1599490 Highlight modified and conflicting fields during conflict resolution · Oct 10, 2014