diff options
| author | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
|---|---|---|
| committer | Gerd Möllmann <gerd@gnu.org> | 2022-12-31 09:04:56 +0100 |
| commit | 716d676747119f9950861f9a64a8e7871b0082d4 (patch) | |
| tree | b71f94b50896736a007d6977c97679e1abd895a6 /admin/gitmerge.el | |
| parent | 54ec3973e298c3d2b3d81484f80053d881694f88 (diff) | |
| parent | 7493b4026fc74a51c76c5b614bc83b864af9bc31 (diff) | |
| download | emacs-scratch/pkg.tar.gz | |
Merge remote-tracking branch 'origin/master' into scratch/pkgscratch/pkg
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index ddd3e184424..1ff8137e154 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -293,7 +293,7 @@ should not be skipped." "Try to resolve conflicts in FILE with smerge. Returns non-nil if conflicts remain." (unless (file-exists-p file) (error "Gitmerge-resolve: Can't find %s" file)) - (with-demoted-errors + (with-demoted-errors "Error: %S" (let ((exists (find-buffer-visiting file))) (with-current-buffer (let ((enable-local-variables :safe) (enable-local-eval nil)) |