On Sun, Aug 18, 2013 at 3:42 PM, Thomas Gummerer <t.gumme...@gmail.com> wrote:
> Make git read the resolve-undo data from the index.
> Since the resolve-undo data is joined with the conflicts in
> the ondisk format of the index file version 5, conflicts and
> resolved data is read at the same time, and the resolve-undo
> data is then converted to the in-memory format.
> Helped-by: Thomas Rast <tr...@student.ethz.ch>
> Signed-off-by: Thomas Gummerer <t.gumme...@gmail.com>
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