Skip to content Features Explore Pricing '"` </textarea></xmp> This repository Sign in or Sign up Watch 4 Star 14 Fork 9 jwiegley / emacs-release Code Issues 0 Pull requests 0 Projects 0 Pulse Graphs Permalink blob contrib key: blob_contributors:v21:6fffe7dcdde21e22d73428bd4839033a Branch: master Switch branches/tags Branches Tags mac-port master Nothing to show Nothing to show Find file Copy path emacs-release / lisp / vc / smerge-mode.el adfd593 Oct 21, 2014 jwiegley emacs-24.4 1 contributor jwiegley Raw Blame History 1359 lines (1251 sloc) 52.3 KB ; ;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding : t -*- ; ; Copyright (C) 1999-2014 Free Software Foundation, Inc. ...