Nicolas Sebrecht <nicolas.s.dev@xxxxxx> writes:
> @@ -22,7 +22,7 @@ static struct unpack_trees_error_msgs unpack_plumbing_errors = {
> "Entry '%s' would be overwritten by merge. Cannot merge.",
>
> /* not_uptodate_file */
> - "Entry '%s' not uptodate. Cannot merge.",
> + "Entry '%s' not up-to-date. Cannot merge.",
>
> /* not_uptodate_dir */
> "Updating '%s' would lose untracked files in it",
> @@ -34,7 +34,7 @@ static struct unpack_trees_error_msgs unpack_plumbing_errors = {
> "Entry '%s' overlaps with '%s'. Cannot bind.",
>
> /* sparse_not_uptodate_file */
> - "Entry '%s' not uptodate. Cannot update sparse checkout.",
> + "Entry '%s' not up-to-date. Cannot update sparse checkout.",
>
> /* would_lose_orphaned */
> "Working tree file '%s' would be %s by sparse checkout update.",
What word do you see before "errors" on the hunk comment line?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html