Merge branch 'bc/object-id' into base

author Michael Haggerty <mhagger@alum.mit.edu>

Sat, 28 Oct 2017 07:27:15 +0000 (09:27 +0200)

committer Michael Haggerty <mhagger@alum.mit.edu>

Sat, 28 Oct 2017 07:27:15 +0000 (09:27 +0200)
author Michael Haggerty <mhagger@alum.mit.edu>
Sat, 28 Oct 2017 07:27:15 +0000 (09:27 +0200)
committer Michael Haggerty <mhagger@alum.mit.edu>
Sat, 28 Oct 2017 07:27:15 +0000 (09:27 +0200)
diff --cc builtin/branch.c
Simple merge
diff --cc builtin/show-branch.c
Simple merge
diff --cc builtin/tag.c
Simple merge
diff --cc refs/files-backend.c
Simple merge
diff --cc sequencer.c
Simple merge
author	Michael Haggerty <mhagger@alum.mit.edu>
	Sat, 28 Oct 2017 07:27:15 +0000 (09:27 +0200)
committer	Michael Haggerty <mhagger@alum.mit.edu>
	Sat, 28 Oct 2017 07:27:15 +0000 (09:27 +0200)
		1	2
builtin/branch.c	patch \|	diff1 \|	diff2 \|	blob \| history
builtin/show-branch.c	patch \|	diff1 \|	diff2 \|	blob \| history
builtin/tag.c	patch \|	diff1 \|	diff2 \|	blob \| history
refs/files-backend.c	patch \|	diff1 \|	diff2 \|	blob \| history
sequencer.c	patch \|	diff1 \|	diff2 \|	blob \| history