Formatted output better. Fixed bug tripple-diff die
Now requires users to run diff before pull