diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2010-01-04 00:32:22 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2010-01-04 00:32:22 +0000 |
| commit | 6100e6c2c9a05beae724a458b7da04447339c31f (patch) | |
| tree | e557781ebadb6d994617836b14891d54522db200 /usr.bin/make | |
| parent | f29b8b7f4174285631176fa87944d7bd29d15ae4 (diff) | |
| download | src-6100e6c2c9a05beae724a458b7da04447339c31f.tar.gz src-6100e6c2c9a05beae724a458b7da04447339c31f.zip | |
Add check for subversion "original" marker.
Notes
Notes:
svn path=/head/; revision=201455
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/parse.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 2c651645b240..3d9a92af71ca 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -802,6 +802,7 @@ ParseDoDependency(char *line) * merges. */ if (strncmp(line, "<<<<<<", 6) == 0 || + strncmp(line, "||||||", 6) == 0 || strncmp(line, "======", 6) == 0 || strncmp(line, ">>>>>>", 6) == 0) { Parse_Error(PARSE_FATAL, "Makefile appears to " |