On 05/03/2011 12:20 PM, Raman Gupta wrote: > Now, putting on our programmer hats again, what *I* think the best > option would be is a 3-way diff with: > > local file on the left > final file in the middle > pkg file on the right > > which would allow us to do the complete 3-way merge. > > But all sysadmin's may not be familar with 3-way merges so I'm not > sure we should go that route. What do you think about adding it as > another option?
Never mind this... can't do it because we don't have the merge base: the original rpm version. Cheers, Raman _______________________________________________ Yum-devel mailing list [email protected] http://lists.baseurl.org/mailman/listinfo/yum-devel
