Make sure to also update delta->nfiles when merging diffs
Make sure to also update delta->nfiles when merging diffs

When diffs are generated, the value for the 'nfiles' field of 'git_diff_delta'
will be consistent with the value in the 'status' field. Merging diffs can
modify the 'status' field of some deltas and the 'nfiles' field needs to be
updated accordingly.

nokiddin/libgit2,joshtriplett/libgit2,ardumont/libgit2,Tousiph/Demo1,since2014/libgit2,t0xicCode/libgit2,mingyaaaa/libgit2,sim0629/libgit2,sygool/libgit2,mhp/libgit2,claudelee/libgit2,sim0629/libgit2,oaastest/libgit2,spraints/libgit2,whoisj/libgit2,falqas/libgit2,amyvmiwei/libgit2,mrksrm/Mingijura,leoyanggit/libgit2,ardumont/libgit2,magnus98/TEST,mhp/libgit2,amyvmiwei/libgit2,mingyaaaa/libgit2,magnus98/TEST,sygool/libgit2,sygool/libgit2,amyvmiwei/libgit2,stewid/libgit2,mrksrm/Mingijura,joshtriplett/libgit2,spraints/libgit2,mrksrm/Mingijura,JIghtuse/libgit2,nokiddin/libgit2,jeffhostetler/public_libgit2,claudelee/libgit2,mrksrm/Mingijura,sygool/libgit2,JIghtuse/libgit2,kissthink/libgit2,mhp/libgit2,kenprice/libgit2,claudelee/libgit2,whoisj/libgit2,Tousiph/Demo1,yosefhackmon/libgit2,whoisj/libgit2,dleehr/libgit2,mhp/libgit2,KTXSoftware/libgit2,spraints/libgit2,kenprice/libgit2,jeffhostetler/public_libgit2,ardumont/libgit2,dleehr/libgit2,Tousiph/Demo1,falqas/libgit2,jeffhostetler/public_libgit2,nokiddin/libgit2,whoisj/libgit2,yongthecoder/libgit2,skabel/manguse,stewid/libgit2,skabel/manguse,saurabhsuniljain/libgit2,mrksrm/Mingijura,since2014/libgit2,mingyaaaa/libgit2,saurabhsuniljain/libgit2,jeffhostetler/public_libgit2,skabel/manguse,mcanthony/libgit2,mcanthony/libgit2,t0xicCode/libgit2,kenprice/libgit2,falqas/libgit2,yosefhackmon/libgit2,KTXSoftware/libgit2,yosefhackmon/libgit2,amyvmiwei/libgit2,dleehr/libgit2,linquize/libgit2,yongthecoder/libgit2,t0xicCode/libgit2,yosefhackmon/libgit2,mingyaaaa/libgit2,sim0629/libgit2,saurabhsuniljain/libgit2,falqas/libgit2,magnus98/TEST,since2014/libgit2,linquize/libgit2,saurabhsuniljain/libgit2,joshtriplett/libgit2,nokiddin/libgit2,oaastest/libgit2,skabel/manguse,Corillian/libgit2,joshtriplett/libgit2,skabel/manguse,chiayolin/libgit2,linquize/libgit2,chiayolin/libgit2,yosefhackmon/libgit2,saurabhsuniljain/libgit2,KTXSoftware/libgit2,iankronquist/libgit2,mcanthony/libgit2,oaastest/libgit2,chiayolin/libgit2,yongthecoder/libgit2,JIghtuse/libgit2,kissthink/libgit2,Corillian/libgit2,Corillian/libgit2,leoyanggit/libgit2,jeffhostetler/public_libgit2,MrHacky/libgit2,leoyanggit/libgit2,mcanthony/libgit2,yongthecoder/libgit2,MrHacky/libgit2,mingyaaaa/libgit2,mrksrm/Mingijura,since2014/libgit2,kissthink/libgit2,mcanthony/libgit2,yosefhackmon/libgit2,kissthink/libgit2,dleehr/libgit2,Corillian/libgit2,kissthink/libgit2,saurabhsuniljain/libgit2,t0xicCode/libgit2,iankronquist/libgit2,mcanthony/libgit2,kenprice/libgit2,sim0629/libgit2,oaastest/libgit2,KTXSoftware/libgit2,chiayolin/libgit2,mingyaaaa/libgit2,spraints/libgit2,spraints/libgit2,sygool/libgit2,stewid/libgit2,falqas/libgit2,nokiddin/libgit2,sygool/libgit2,JIghtuse/libgit2,JIghtuse/libgit2,jeffhostetler/public_libgit2,spraints/libgit2,linquize/libgit2,since2014/libgit2,Tousiph/Demo1,t0xicCode/libgit2,chiayolin/libgit2,claudelee/libgit2,MrHacky/libgit2,nokiddin/libgit2,MrHacky/libgit2,magnus98/TEST,KTXSoftware/libgit2,mhp/libgit2,yongthecoder/libgit2,KTXSoftware/libgit2,t0xicCode/libgit2,MrHacky/libgit2,claudelee/libgit2,sim0629/libgit2,whoisj/libgit2,leoyanggit/libgit2,leoyanggit/libgit2,yongthecoder/libgit2,falqas/libgit2,MrHacky/libgit2,skabel/manguse,oaastest/libgit2,amyvmiwei/libgit2,claudelee/libgit2,Corillian/libgit2,ardumont/libgit2,whoisj/libgit2,iankronquist/libgit2,ardumont/libgit2,Corillian/libgit2,mhp/libgit2,amyvmiwei/libgit2,stewid/libgit2,kenprice/libgit2,stewid/libgit2,kissthink/libgit2,leoyanggit/libgit2,ardumont/libgit2,magnus98/TEST,JIghtuse/libgit2,iankronquist/libgit2,magnus98/TEST,sim0629/libgit2,Tousiph/Demo1,chiayolin/libgit2,Tousiph/Demo1,dleehr/libgit2,joshtriplett/libgit2,oaastest/libgit2,dleehr/libgit2,stewid/libgit2,linquize/libgit2,since2014/libgit2,iankronquist/libgit2,kenprice/libgit2,iankronquist/libgit2,linquize/libgit2,joshtriplett/libgit2