Re: [PATCH v2 2/3] merge: split write_merge_state in two

2017-08-21 Thread Junio C Hamano
Michael J Gruber writes: > write_merge_state() writes out the merge heads, mode, and msg. But we > may want to write out heads, mode without the msg. So, split out heads > (+mode) into a separate function write_merge_heads() that is called by > write_merge_state(). > > No

[PATCH v2 2/3] merge: split write_merge_state in two

2017-08-21 Thread Michael J Gruber
write_merge_state() writes out the merge heads, mode, and msg. But we may want to write out heads, mode without the msg. So, split out heads (+mode) into a separate function write_merge_heads() that is called by write_merge_state(). No funtional change so far. Signed-off-by: Michael J Gruber