aboutsummaryrefslogtreecommitdiff
path: root/sysutils/etcmerge
Commit message (Expand)AuthorAgeFilesLines
* I had been testing the wrong version.Eivind Eklund2003-08-202-2/+3
* Update to 0.2:Eivind Eklund2003-08-142-1/+12
* 3-way merge for /etc (mergemaster replacement)Eivind Eklund2003-07-305-0/+709