From: Junio C Hamano <hidden> Date: 2016-06-15 22:44:58
Johannes Sixt [off-list ref] writes:
Assume that we want to commit these states:
Old state == HEAD Intermediate state New state
--------------------------------------------------------
context before context before context before
old 1 new 1 new 1
old 2 old 2 new 2
context after context after context after