tree 1888b316163a5c96efc874a3d8f40b219a2af0e0
parent cb365a7a564152662e3f9c5b9a92e37aaf726ed9
parent aa9ea77de4fffd133b3da1d36a19fd0bd11ad368
author Junio C Hamano <gitster@pobox.com> 1238699677 -0700
committer Junio C Hamano <gitster@pobox.com> 1238699677 -0700

Merge branch 'jc/maint-1.6.0-blame-s' into maint

* jc/maint-1.6.0-blame-s:
  blame: read custom grafts given by -S before calling setup_revisions()

Conflicts:
	builtin-blame.c