granicus.if.org Git - git/commit

]> granicus.if.org Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Thu, 25 Jun 2015 17:47:46 +0000 (10:47 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 25 Jun 2015 17:47:46 +0000 (10:47 -0700)
commit	b5496cbd2291443b0ad0bf686db51fce6ffad863
tree	f94de64568d0607ed1531920889dca82f877873a	tree \| snapshot
parent	df97e5dfeaea093e50afc15e44a23dfd3fa02502	commit \| diff
parent	78cc1a540ba127b13f2f3fd531777b57f3a9cd46	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
diff-lib.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

builtin/add.c	diff1 \|	diff2 \|	blob \| history
diff-lib.c	diff1 \|	diff2 \|	blob \| history