Jens Lehmann <jens.lehm...@web.de> writes:
> Changes since v3:
> - Added get_ours_cache_pos() helper to only check stage 2 of a conflict
> - Added tests for modified submodules in the conflict case
> + /*
> + * Skip unmerged entries except for populated submodules
> + * that could loose history when removed.
> + */
s/loose/lose/, I think.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html