Re: [PATCH v3 0/2] checkout -m: recreate conflict labels

Phillip Wood [off-list ref] writes:

Changes since V2:

 - only write ".git/MERGE_LABELS" when there are conflicts and added
   a check to an existing "checkout -m <branch>" test
 - change write_merge_labels() to take an array of labels
 - use a local variable to store the internal merge state when writing
   labels
 - use strbuf_detach() rather than xmemdupz() when reading labels
 - add a comment to say we ignore trailing cruft when reading the
   labels file

These patches looked nicely done.

Will replace.  Thanks.