Mercurial > emacs
view etc/emacs.py @ 93445:87b6e6f4a207
(smerge-apply-resolution-patch): New fun.
(smerge-resolve): Add various resolution heuristics.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 31 Mar 2008 02:57:39 +0000 |
parents | 69c173eabff4 |
children | bdb3fe0ba9fa ef719132ddfa |
line wrap: on
line source
"""Wrapper for version-specific implementations of python.el helper functions """ import sys if sys.version_info[0] == 3: from emacs3 import * else: from emacs2 import * # arch-tag: 894b5227-638f-45fd-8567-0417d5c35900