diff -ur origsettings/ settings > settings_hand_edits.diff
