Use parent's sort order (if present) in diff view
Merge pull request #643 from cmc333333/diff-order

Use parent's sort order (if present) in diff view