diff options
| author | Eivind Eklund <eivind@FreeBSD.org> | 2003-07-30 16:55:35 +0000 |
|---|---|---|
| committer | Eivind Eklund <eivind@FreeBSD.org> | 2003-07-30 16:55:35 +0000 |
| commit | 91a486bcf437966be7e2bbd4ab024d5bdc486052 (patch) | |
| tree | 9b77750b49070a0460368225a91b5933a81e2038 /sysutils/Makefile | |
| parent | *grrr* COMMENT needs to be overrideable too. (diff) | |
3-way merge for /etc (mergemaster replacement)
Notes
Notes:
svn path=/head/; revision=85919
Diffstat (limited to 'sysutils/Makefile')
| -rw-r--r-- | sysutils/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index 416a7fbda9ab..1490e6ba6c8b 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -78,6 +78,7 @@ SUBDIR += e2fsprogs SUBDIR += eject SUBDIR += enteruser + SUBDIR += etcmerge SUBDIR += extipl SUBDIR += fastest_cvsup SUBDIR += fastresolve |