# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 354 | Kelly Setzer | integ | ||
//guest/perforce_software/utils/emacs_mrg/p4merge.tar | |||||
#1 | 245 | Laura Wingerd |
Add emacs p4merge files, belatedly, and removed link to missing emacs integration, since the version we have is really old. |