use tildoc for removing heredoc leading margins
returns filename pair as hash keys
align options
add revision info to diff outputs
refine diff output format
Merge branch 'develop'