Conversation
Notices
-
drak (drak@sn.1w6.org)'s status on Monday, 03-Aug-2020 13:04:22 EDT
drak
M-x smerge-ediff: resolve conflicts written to a file using a diff-tool in #Emacs
Jonkman Microblog is a social network, courtesy of SOBAC Microcomputer Services. It runs on GNU social, version 1.2.0-beta5, available under the GNU Affero General Public License.
All Jonkman Microblog content and data are available under the Creative Commons Attribution 3.0 license.