On Thursday 18 September 2008 01:40:16 Johannes Sixt wrote: > On Mittwoch, 17. September 2008, Alexander Gavrilov wrote: > > By the way, is there a simple way to re-create a conflict file from > > the saved multistage index entries? > > There's 0cf8581e (checkout -m: recreate merge when checking out of unmerged > index) in 'next'. But that does not address how the unmerged entries get into > the index. If everything else fails, the entries can be fetched from the index and cached in RAM by git-gui itself. Then it will be able to put them back via update-index --index-info. Alexander -- 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
