text file differencing and merging tool