|After looking at man mergemaster, I decided to run it with the following
# /usr/local/sbin/mergemaster -svd -w120
I just followed the instructions. Be careful about merging binary files. I
did that and it messed up my screen. I had to logout and restart my telnet session
to clear it. And when I restarted mergemaster, here's the line I used:
/usr/local/sbin/mergemaster -rdsv -w 120 -t /var/tmp/temproot.0304.18.54
The actual directory will be dependant upon the date and time you ran mergemaster.
At the end of the process, all files will have been merged and whatever is left in.
Another thing I did during this process was change my default editor. For
some reason, it was vi and I prefer ee.