   (if (fboundp 'point-at-eol) 'point-at-eol 'line-end-position))
 (defalias 'svn-point-at-bol
   (if (fboundp 'point-at-bol) 'point-at-bol 'line-beginning-position))
-(defalias 'svn-read-directory-name 
+(defalias 'svn-read-directory-name
   (if (fboundp 'read-directory-name) 'read-directory-name 'read-file-name))
 
 (eval-when-compile

  "*A list of environment variables that should be set for that svn process.
Each element is either a string \"VARIABLE=VALUE\" which will be added to
the environment when svn is run, or just \"VARIABLE\" which causes that
variable to be entirely removed from the environment. 

You could set this for example to '(\"LANG=C\")"
  :type '(repeat string)

    (save-excursion
      (set-buffer your-buffer)
      (erase-buffer)
      (insert-buffer-substring result-buffer)
      (goto-char (point-min))
      (while (re-search-forward "^<<<<<<< .mine\n" nil t)
        (setq found t)
