Mercurial > emacs
comparison lisp/smerge-mode.el @ 65164:4cc6dbdfa5af
(eshell-flatten-list): Don't call eshell-flatten-list on a
sub-argument if it is eq to nil.
| author | John Wiegley <johnw@newartisans.com> |
|---|---|
| date | Fri, 26 Aug 2005 22:35:57 +0000 |
| parents | ebbbce58e84c |
| children | 66ed969ca7cc 532e0a9335a9 a3716f7538f2 |
comparison
equal
deleted
inserted
replaced
| 65163:ef138cf4be94 | 65164:4cc6dbdfa5af |
|---|