Merge "(Bug 41658) Allow diffs across text based content."