diff options
author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-05-19 10:53:05 +0000 |
---|---|---|
committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2016-05-19 10:53:05 +0000 |
commit | 1f8b48b772b2d0ac0ed48a8259d2117ea3236a90 (patch) | |
tree | 06f11bc7b351f3abf3bf5507405afdba5374614e /sysutils/rej/pkg-descr | |
parent | 4e942b64191e2ef98dce2c5af31047a8640db768 (diff) |
Notes
Diffstat (limited to 'sysutils/rej/pkg-descr')
-rw-r--r-- | sysutils/rej/pkg-descr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysutils/rej/pkg-descr b/sysutils/rej/pkg-descr index f290e5d2b87e..8643fc6fcf4c 100644 --- a/sysutils/rej/pkg-descr +++ b/sysutils/rej/pkg-descr @@ -1,7 +1,7 @@ rej tries to merge simple patch-rejects and then run a merge program so the changes can be verified. It is not meant to resolve complex problems that would not be immediately obvious to the programmer, the goal instead is to -quickly fix the easy problems. +quickly fix the easy problems. rej understands both unified and context diffs. |