diff options
author | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
---|---|---|
committer | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
commit | e0f0f573a4a8fc1f564a31388afa9c23e48bb016 (patch) | |
tree | b7c004b3aae01c79bef8c8914e759a1e3ce358f7 /driver/Driver.ml | |
parent | 18fcf2ffef8b4ba5eb0624b15371e93b4ac88cfe (diff) | |
parent | e2b4459ccd1b0f8436cb70a631772d715e642dcd (diff) | |
download | compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.tar.gz compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.zip |
fix merge conflicts
Diffstat (limited to 'driver/Driver.ml')
-rw-r--r-- | driver/Driver.ml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/driver/Driver.ml b/driver/Driver.ml index 9c07dba1..0bfc7167 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -341,6 +341,7 @@ General options:\n\ \ -v Print external commands before invoking them\n\ \ -timings Show the time spent in various compiler passes\n\ \ -version Print the version string and exit\n\ +\ @<file> Read command line options from <file>\n\ Interpreter mode:\n\ \ -interp Execute given .c files using the reference interpreter\n\ \ -quiet Suppress diagnostic messages for the interpreter\n\ |