Git’s diff engine has a new heuristic for clarity in version 2.9. Diffs primarily show changes, additions, and deletions, King explained.

Git probably won't be very good out-of-the-box at diff-ing and merging changes to files relevant to the UI of the app, unless this Pentaho thing happens to use plaintext files for that.