A utility for solving diff/patch rejects
