summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1994-02-04 01:18:01 +0000
committerKarl Heuer <kwzh@gnu.org>1994-02-04 01:18:01 +0000
commit45d82bdc5d42e38100315a19c974aabb3572157f (patch)
tree8771a29754346d906e2b6830f62726b993ea2384 /lisp/emacs-lisp
parentee095968e6eec243a912a1e6aff6ed93125824e8 (diff)
downloademacs-45d82bdc5d42e38100315a19c974aabb3572157f.tar.gz
emacs-45d82bdc5d42e38100315a19c974aabb3572157f.tar.bz2
emacs-45d82bdc5d42e38100315a19c974aabb3572157f.zip
Add comments describing the rules used by the merge algorithm.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions