Mercurial > emacs
changeset 54203:a37354a6c326
Resolve CVS conflicts
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 29 Feb 2004 22:18:04 +0000 |
parents | 8491a6eafd00 |
children | e0d19d483614 90ccc0dc0d3f |
files | man/tramp.texi man/trampver.texi |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/man/tramp.texi Sun Feb 29 22:08:05 2004 +0000 +++ b/man/tramp.texi Sun Feb 29 22:18:04 2004 +0000 @@ -2298,3 +2298,7 @@ @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
--- a/man/trampver.texi Sun Feb 29 22:08:05 2004 +0000 +++ b/man/trampver.texi Sun Feb 29 22:18:04 2004 +0000 @@ -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