summaryrefslogtreecommitdiff
path: root/patch.man
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2009-04-05 23:46:02 +0200
committerAndreas Gruenbacher <agruen@suse.de>2009-04-05 23:46:02 +0200
commitfea737a1b5acd3638d9e49c6e5dcbc64c7d399ca (patch)
tree18e28f4b06d16713559a2b24790a0ee890fb459e /patch.man
parenta03f22893c29a2a5423160a9fa2c8ec914408b82 (diff)
downloadpatch-fea737a1b5acd3638d9e49c6e5dcbc64c7d399ca.tar.gz
Document that merging can be slow
Diffstat (limited to 'patch.man')
-rw-r--r--patch.man4
1 files changed, 4 insertions, 0 deletions
diff --git a/patch.man b/patch.man
index 014de60..34e840d 100644
--- a/patch.man
+++ b/patch.man
@@ -1167,6 +1167,10 @@ If you apply a patch you've already applied,
.B patch
thinks it is a reversed patch, and offers to un-apply the patch.
This could be construed as a feature.
+.PP
+Computing how to merge a hunk is significantly harder than using the standard
+fuzzy algorithm. Bigger hunks, more context, a bigger offset from the
+original location, and a worse match all slow the algorithm down.
.SH COPYING
Copyright
.ie t \(co