aboutsummaryrefslogtreecommitdiff
path: root/sysutils/etcmerge/src
Commit message (Expand)AuthorAgeFilesLines
* I had been testing the wrong version.Eivind Eklund2003-08-201-2/+2
* Update to 0.2:Eivind Eklund2003-08-141-0/+11
* 3-way merge for /etc (mergemaster replacement)Eivind Eklund2003-07-302-0/+670