Add the --shortstat flag to examples/diff.c
fix the output format of diff
Merge completed: resolve the conflict with the upstream
Merge pull request #2162 from sunheehnus/dev

examples/diff:Add the shortstat flag to examples/diff.c