diff options
| author |   nicm <nicm@openbsd.org> | 2010-07-13 20:47:56 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-07-13 20:47:56 +0000 |
| commit | 21d02a4b95bf7f266afa5587c336056d0cff37cb (patch) | |
| tree | 1fe56d78cdf7aac425ab2aa5ad92c841c558b396 /sys | |
| parent | Do not put the file into conflict if it is no longer modified (user has (diff) | |
| download | wireguard-openbsd-21d02a4b95bf7f266afa5587c336056d0cff37cb.tar.xz wireguard-openbsd-21d02a4b95bf7f266afa5587c336056d0cff37cb.zip | |
regress for merge bug.
Diffstat (limited to 'sys')
0 files changed, 0 insertions, 0 deletions