summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>2000-05-25 17:21:32 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>2000-05-25 17:21:32 +0000
commit7997f1ca362d13356b7a964de799d395b70ef454 (patch)
tree455d23b4c78ebe8cc7949c6c9c646a5d47b72bdc /lisp/smerge-mode.el
parente7a903e81f21db5fc041c9f10bf7821aeb3bcd3f (diff)
downloademacs-7997f1ca362d13356b7a964de799d395b70ef454.tar.gz
emacs-7997f1ca362d13356b7a964de799d395b70ef454.tar.bz2
emacs-7997f1ca362d13356b7a964de799d395b70ef454.zip
2000-05-25 Michael Kifer <kifer@cs.sunysb.edu>
* ediff-diff.el (ediff-exec-process): delete --binary option from non-buffer ediff jobs.
Diffstat (limited to 'lisp/smerge-mode.el')
0 files changed, 0 insertions, 0 deletions