Re: [PATCH] git-merge-recursive: honor merge.conflictstyle once again
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:30
Matt McCutchen [off-list ref] writes:
This was originally implemented in c236bcd06138bcbc929b86ad1a513635bf4847b2 but was lost to a mismerge in 9ba929ed652f5ed7707f1c684999af4ad02c4925.
Good eyes; thanks.