This adds diffs for use in an interactive merge when detecting an edit conflict. Bug: T230843 Change-Id: I6345361fce98524027ad778749d4fbf54169ccb6
Bug: T230843 Change-Id: I95289eddfc9ab2e0cef11b9363a5e239cdb2258e