]> git.eshelyaron.com Git - emacs.git/commit
; Improve resolution of previous merge conflict
authorGlenn Morris <rgm@gnu.org>
Tue, 7 Sep 2021 16:41:38 +0000 (09:41 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 7 Sep 2021 16:41:57 +0000 (09:41 -0700)
commit0cd410fb82d780f3c3d3e870103344ca6ef83234
tree61b230f943bf9d04ed9a4cf23c176fe2ad25a922
parent400b3c9376a5de033f98476263b7fe65988289a8
; Improve resolution of previous merge conflict
doc/misc/efaq.texi