Change 245
Add emacs p4merge files, belatedly, and removed link to
missing emacs integration, since the version we have is
really old.
missing emacs integration, since the version we have is
really old.
Tip: Use n and p to cycle through the changes.