Merge pull request #3024 from git-up/diff_merge_fix Make sure to also update delta->nfiles when merging diffs
2015-04-19T19:58:03