Merge "Add script for running diff easily"