diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 112a9bc5247..91be89b5dc1 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el | |||
| @@ -725,7 +725,7 @@ this keeps \"UUU\"." | |||
| 725 | (let ((i 3)) | 725 | (let ((i 3)) |
| 726 | (while (or (not (match-end i)) | 726 | (while (or (not (match-end i)) |
| 727 | (< (point) (match-beginning i)) | 727 | (< (point) (match-beginning i)) |
| 728 | (>= (point) (match-end i))) | 728 | (> (point) (match-end i))) |
| 729 | (cl-decf i)) | 729 | (cl-decf i)) |
| 730 | i)) | 730 | i)) |
| 731 | 731 | ||