aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKonstantin Kharlamov2019-02-18 09:15:08 -0500
committerStefan Monnier2019-02-18 09:15:08 -0500
commit2eecaa28972320a1b8886ac8cde353c2a2f4aa44 (patch)
tree4a91a934d0a134a3868937b47debd8c900e58450 /src
parentb05702d7eb803dbf536e4b589bb80838150559a3 (diff)
downloademacs-2eecaa28972320a1b8886ac8cde353c2a2f4aa44.tar.gz
emacs-2eecaa28972320a1b8886ac8cde353c2a2f4aa44.zip
* lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New command
Copyright-paperwork-exempt: yes
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions