diff options
| author | delphij <delphij@FreeBSD.org> | 2016-06-11 05:53:50 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2016-06-11 05:53:50 +0000 |
| commit | afd5dcd0c5fb4195bd1d2eaf9f7c6394c5783651 (patch) | |
| tree | 1bd142d50fcc4f217af7b594ffb7b1730db10e9c /contrib/diff/src/diff3.c | |
| parent | 2c7ed6001525c898672c7037aa94e033b57a81ae (diff) | |
| download | FreeBSD-src-afd5dcd0c5fb4195bd1d2eaf9f7c6394c5783651.zip FreeBSD-src-afd5dcd0c5fb4195bd1d2eaf9f7c6394c5783651.tar.gz | |
MFC r301584: Apply mergemaster r255428:
Pass -n (do not emit comments) when saving mtree information for future
mergemaster(8) runs.
Diffstat (limited to 'contrib/diff/src/diff3.c')
0 files changed, 0 insertions, 0 deletions
