commit 65ad4e61087e708b8ec592c0ba5fe32955fcdc65 from: Stefan Sperling date: Wed Feb 20 07:37:01 2019 UTC improve wording of a comment in merge_blob() commit - 80c5c120285b0b38cf25a37858e737047c570a98 commit + 65ad4e61087e708b8ec592c0ba5fe32955fcdc65 blob - 4f18b2ae84584657b22a765e3ba1d0aac5e9c6b8 blob + c0988d071d4854ceebaab737557de54bd5270fb3 --- lib/worktree.c +++ lib/worktree.c @@ -799,7 +799,7 @@ merge_blob(struct got_worktree *worktree, struct got_f /* * Do not update timestamps of already modified files. Otherwise, - * the status walk would treat them as unmodified files again. + * a future status walk would treat them as unmodified files again. */ err = got_fileindex_entry_update(ie, ondisk_path, blob1->id.sha1, worktree->base_commit_id->sha1, update_timestamps);