diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-08-11 08:15:45 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-08-11 08:15:45 +0000 |
| commit | 840c4dcec1d0cb8ba2be2b678f5083ed260dc322 (patch) | |
| tree | 43d379018e0181e5f88f6bf370c95b68ed502b88 /regress/usr.bin/rcs/merge-eflag.out | |
| parent | 254f544f5375bc6a856079ac95b7f5582400af8b (diff) | |
add tests for merge -e; OK ray@.
Diffstat (limited to 'regress/usr.bin/rcs/merge-eflag.out')
| -rw-r--r-- | regress/usr.bin/rcs/merge-eflag.out | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/regress/usr.bin/rcs/merge-eflag.out b/regress/usr.bin/rcs/merge-eflag.out new file mode 100644 index 00000000000..4c05eb38a5c --- /dev/null +++ b/regress/usr.bin/rcs/merge-eflag.out @@ -0,0 +1,4 @@ +line1 +file3new +line2 +file1new |