use -U instead of -u, and if diff throws an error, consider composite changed (not unchanged) >> master