Merge branch 'maint'

* maint:
  add technical documentation about ref iteration
  Do not use C++-style comments

1 files changed, 1 insertions, 1 deletions

diff --git a/notes.c b/notes.c
index f6ce8489d3..93e9868d5d 100644
--- a/notes.c
+++ b/notes.c
@@ -1105,7 +1105,7 @@ int remove_note(struct notes_tree *t, const unsigned char *object_sha1)
 	hashcpy(l.key_sha1, object_sha1);
 	hashclr(l.val_sha1);
 	note_tree_remove(t, t->root, 0, &l);
-	if (is_null_sha1(l.val_sha1)) // no note was removed
+	if (is_null_sha1(l.val_sha1)) /* no note was removed */
 		return 1;
 	t->dirty = 1;
 	return 0;