procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve CVS conflicts

Browse source
This commit is contained in:
Miles Bader 2004-02-29 22:18:04 +00:00
parent aef3a1f2eb
commit 3f383e4ad7
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
man/tramp.texi
View file

@ -2298,3 +2298,7 @@ for @value{emacs-other-name}.
@c ** Use `filename' resp. `file name' consistently.
@c ** Use `host' resp. `machine' consistently.
@c ** Consistent small or capitalized words especially in menues.
@ignore
arch-tag: f96dd66e-6dd3-4c92-8d77-9c56205ba808
@end ignore

4
man/trampver.texi
View file

@ -59,4 +59,6 @@
@c standalone. That's why it is included from `trampinst.texi'.
@c Otherwise, '/dev/null/' is taken, which leaves this part empty.
@ignore
arch-tag: e0fe322c-e06b-46eb-bb5b-d091b521f41c
@end ignore