Fix :Gstatus dp with external diff enabled

Closes #341.
Merge remote-tracking branch 'upstream/master'