File and directory diff and merge tool
