Merge branch 'nd/diff-i-t-a'

* nd/diff-i-t-a:
Revert "diff-lib.c: adjust position of i-t-a entries in diff"

diff --cc builtin/add.c
Simple merge

diff --cc diff-lib.c
Simple merge