From: Stefan Beller <sbeller@google.com>
Date: Wed, 22 Nov 2017 18:36:54 GMT
Subject: Re: [PATCH v3 22/33] merge-recursive: check for directory level conflicts
Message-ID: <CAGZ79kZfOUjdOKA4JE8v18ETZH1n5ViUWt+khsjFX1jsp-uY7w@mail.gmail.com>
In-Reply-To: <20171121080059.32304-23-newren@gmail.com>

> +                       /* We can assume it's not rename/rename(1to1) because
> +                        * that was case (1), already checked above.  So we
> +                        * know that head_ent->new_dir and merge_ent->new_dir
> +                        * are different strings.
> +                        */

micro nit:

/* we prefer comments like this */

/*
 * or like this
 */

/* but not
 * like this.
 */