Probe context diff for #15
Should tolerate dos format
Merge remote-tracking branch 'origin/context-diff'
Fall through unknown format to 'unified', fixed #18