summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-vers.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-10-22 23:38:24 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-10-22 23:38:24 -0700
commitcfc09582247ffef6a46b6249e2fba9136a62d21e (patch)
tree50e102f64a2b88c692d9110990abd416c78c32f0 /lisp/vc/ediff-vers.el
parent92c938895c639463681ae1c58a944cae62b70b87 (diff)
parent86c606818495d9411fd5d6b1477f9a097eb18020 (diff)
downloademacs-cfc09582247ffef6a46b6249e2fba9136a62d21e.tar.gz
Merge from trunk.
Diffstat (limited to 'lisp/vc/ediff-vers.el')
0 files changed, 0 insertions, 0 deletions