Commit 7dc1b1c4abd7f9f1ff7628ddea317e74b0040c2c

Pierre-Olivier Latour 2015-03-30T14:06:21

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.