resolve merge conflicts

Author: jedwards4b

cime_config/config_archive.xml

@@ -10,12 +10,14 @@
     <hist_file_extension>e</hist_file_extension>
     <rest_history_varname>nhfil</rest_history_varname>
     <rpointer>
-      <rpointer_file>rpointer.atm$NINST_STRING</rpointer_file>
-      <rpointer_content>$CASE.cam$NINST_STRING.r.$DATENAME.nc</rpointer_content>
+      <rpointer_file>rpointer.cam$NINST_STRING.$DATENAME</rpointer_file>
+      <rpointer_content>$CASE.cam$NINST_STRING.r.$DATENAME.nc </rpointer_content>
     </rpointer>
     <test_file_names>
-      <tfile disposition="copy">rpointer.atm</tfile>
-      <tfile disposition="copy">rpointer.atm_9999</tfile>
+      <tfile disposition="copy">rpointer.cam.1976-01-01-00000</tfile>
+      <tfile disposition="copy">rpointer.cam_9999.1976-01-01-00000</tfile>
+      <tfile disposition="ignore">rpointer.cam.1976-02-01-00000</tfile>
+      <tfile disposition="ignore">rpointer.cam_9999.1976-01-02-00000</tfile>
       <tfile disposition="copy">casename.cam.r.1976-01-01-00000.nc</tfile>
       <tfile disposition="copy">casename.cam.rh4.1976-01-01-00000.nc</tfile>
       <tfile disposition="move">casename.cam.h0.1976-01-01-00000.nc</tfile>