Commit 65ad4e61087e708b8ec592c0ba5fe32955fcdc65

Stefan Sperling 2019-02-20T08:37:01

improve wording of a comment in merge_blob()

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/lib/worktree.c b/lib/worktree.c
index 4f18b2a..c0988d0 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -799,7 +799,7 @@ merge_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
 
 	/*
 	 * 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);