moved inherited definitions from magit to diff
Merge pull request #5 from sabof/magit_to_diff

moved inherited definitions from magit to diff