commit 50d3178a4fa6fbfaaaeee7025e8d9ad3a070aea0 (HEAD, refs/remotes/origin/master)
Author: Glenn Morris <rgm@gnu.org>
Date:   Wed Aug 4 17:42:55 2021 -0700

    * lisp/cus-start.el (read-minibuffer-restore-windows): Fix entry.

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 27b98f2d80..1997530789 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -431,7 +431,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 	      "21.1"
               :set minibuffer-prompt-properties--setter)
 	     (minibuffer-auto-raise minibuffer boolean)
-             (read-minibuffer-restore-windows boolean "28.1")
+	     (read-minibuffer-restore-windows minibuffer boolean "28.1")
 	     ;; options property set at end
 	     (read-buffer-function minibuffer
 				   (choice (const nil)

commit 4b729ff60887f2de320a99cf1fb4c734d1145b00
Author: Juri Linkov <juri@linkov.net>
Date:   Wed Aug 4 23:43:21 2021 +0300

    * lisp/vc/smerge-mode.el (smerge-mode-menu): Add menu item for smerge-refine.

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 694d4529b9..956d9b3801 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -214,6 +214,9 @@ Used in `smerge-diff-base-upper' and related functions."
     ["Invoke Ediff" smerge-ediff
      :help "Use Ediff to resolve the conflicts"
      :active (smerge-check 1)]
+    ["Refine" smerge-refine
+     :help "Highlight different words of the conflict"
+     :active (smerge-check 1)]
     ["Auto Resolve" smerge-resolve
      :help "Try auto-resolution heuristics"
      :active (smerge-check 1)]

commit 1910800f93cdc5fd9bc657e7f65e9db9c8e94de0
Author: dickmao <none>
Date:   Wed Aug 4 10:50:38 2021 +0200

    Package archive location needs to be absolute filename
    
    * lisp/emacs-lisp/package.el (package--with-response-buffer-1):
    Actually check that URL is absolute (bug#49788).

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index f1daa8d124..37dcbe36c8 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1366,11 +1366,9 @@ errors signaled by ERROR-FORM or by BODY).
                 (kill-buffer buffer)
                 (goto-char (point-min))))))
       (package--unless-error body
-        (let ((url (expand-file-name file url)))
-          (unless (file-name-absolute-p url)
-            (error "Location %s is not a url nor an absolute file name"
-                   url))
-          (insert-file-contents-literally url)))))
+        (unless (file-name-absolute-p url)
+          (error "Location %s is not a url nor an absolute file name" url))
+        (insert-file-contents-literally (expand-file-name file url)))))
 
 (define-error 'bad-signature "Failed to verify signature")