am: suppress apply errors when using 3-way

diff --git a/read-cache.c b/read-cache.c
index 7f74c8d16126ec72bba98bd5b31da0f37f499691..3f587110cb9d7be1890b7db68a0bdac35d48cd35 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1563,8 +1563,8 @@ int write_index(struct index_state *istate, int newfd)
 
        if (ce_flush(&c, newfd) || fstat(newfd, &st))
                return -1;
-       istate->timestamp.sec = (unsigned int)st.st_ctime;
-       istate->timestamp.nsec = ST_CTIME_NSEC(st);
+       istate->timestamp.sec = (unsigned int)st.st_mtime;
+       istate->timestamp.nsec = ST_MTIME_NSEC(st);
        return 0;
 }