summaryrefslogtreecommitdiff
path: root/lisp/vc/cvs-status.el
diff options
context:
space:
mode:
authorJoakim Verona <joakim@verona.se>2011-12-28 04:12:56 +0100
committerJoakim Verona <joakim@verona.se>2011-12-28 04:12:56 +0100
commitbb29f044aa967831cd664c54eba0de0c701436ce (patch)
tree1398cc9780bbae0fdad071a3a3765a571c3f6d7b /lisp/vc/cvs-status.el
parent3c935a7e996701244d166f684119f0ff97e25496 (diff)
parent5e605a2e528955721fc6f2bd7b9f174c15075fb1 (diff)
downloademacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.gz
emacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.bz2
emacs-bb29f044aa967831cd664c54eba0de0c701436ce.zip
upstream i think
Diffstat (limited to 'lisp/vc/cvs-status.el')
-rw-r--r--lisp/vc/cvs-status.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index 063eb414579..3444b230e8d 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -257,7 +257,7 @@ The tree will be printed no closer than column COLUMN."
(defun cvs-tree-merge (tree1 tree2)
"Merge tags trees TREE1 and TREE2 into one.
-BEWARE: because of stability issues, this is not a symetric operation."
+BEWARE: because of stability issues, this is not a symmetric operation."
(assert (and (listp tree1) (listp tree2)))
(cond
((null tree1) tree2)