Diff images working (except working copy changes)