o Add merge note.

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index f23bcb8d7dccb6aa13e6380f02de9a1b04747baa..603ace46357a3799c24de3d680d2e27025165237 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -53,6 +53,14 @@ contains the GSI-OpenSSH code.  Consider it a living document.
 
   [ History ]
 
+    2003/07/25
+    ----------
+      Action: Merge
+        - occurred on: GPT branch
+        - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
+        - new base: OPENSSH_3_6_1P2_GSSAPI_20030721
+      Conflicts: 0
+
     2003/05/05
     ----------
       Action: Merge