Conversation
Notices
-
drak (drak@sn.1w6.org)'s status on Saturday, 21-Mar-2020 18:33:10 EDT
drak
Using #ediff3 from #Emacs as merge-tool in #Mercurial (hg): https://www.draketo.de/software/mercurial-ediff3-emacs.html
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.