On Sun, Aug 18, 2013 at 3:42 PM, Thomas Gummerer <[email protected]> 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
s/is/are/ > data is then converted to the in-memory format. > > Helped-by: Thomas Rast <[email protected]> > Signed-off-by: Thomas Gummerer <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
