Cherrypick: select and apply diffs between texts
Cherrypick: select and apply diffs between texts

Display diffs, allow their selection and apply approved diffs.
Return text obtained by applying only approved diffs.

Change-Id: I11b5f36b2416f3f9a9209141d9df3fab483004b8

emijrp/pywikibot-core,valhallasw/pywikibot-core,jayvdb/pywikibot-core,hasteur/g13bot_tools_new,TridevGuha/pywikibot-core,hasteur/g13bot_tools_new,jayvdb/pywikibot-core,h4ck3rm1k3/pywikibot-core,npdoty/pywikibot,happy5214/pywikibot-core,wikimedia/pywikibot-core,icyflame/batman,darthbhyrava/pywikibot-local,smalyshev/pywikibot-core,xZise/pywikibot-core,wikimedia/pywikibot-core,trishnaguha/pywikibot-core,npdoty/pywikibot,PersianWikipedia/pywikibot-core,magul/pywikibot-core,happy5214/pywikibot-core,Darkdadaah/pywikibot-core,Darkdadaah/pywikibot-core,h4ck3rm1k3/pywikibot-core,VcamX/pywikibot-core,magul/pywikibot-core,hasteur/g13bot_tools_new