diff etc/enriched.doc @ 21368:37b978fc46cb

(vc-merge, vc-backend-merge): New functions. (vc-resolve-conflicts): Added optional parameters for buffer names. (vc-branch-p): New function.
author André Spiegel <spiegel@gnu.org>
date Sun, 05 Apr 1998 18:45:06 +0000
parents c510bee23510
children 026d2f64b0c3
line wrap: on
line diff