Merge branch 'nd/diff-i-t-a'
commitb5496cbd2291443b0ad0bf686db51fce6ffad863
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 17:47:46 +0000 (25 10:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2015 17:47:46 +0000 (25 10:47 -0700)
treef94de64568d0607ed1531920889dca82f877873a
parentdf97e5dfeaea093e50afc15e44a23dfd3fa02502
parent78cc1a540ba127b13f2f3fd531777b57f3a9cd46
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"
builtin/add.c
diff-lib.c