tree e0d9cd4449e0291f17ae874b6529882dd85a7ed1
parent ac9bab60a2331595eecbeb4a477ef627e402c922
parent d1188c76bff99ad4b3b627ae4274ebbad9d906ef
author Youssef Elghareeb <ghareeb@google.com> 1627373844 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1627373844 +0000

Merge changes If2cab046,I6df0470c

* changes:
  Git file diff: fix when JGit returns multiple entries for same file path
  Adapt diff tests after FileInfoJson started using experiment features