Added hint how to change diff tool
Fixed compilation