Merge branch 'km/avoid-cp-a'

diff --git a/builtin/blame.c b/builtin/blame.c
index e5b5d71bad8653f4b9d19044c3c36dc2ab8b42f1..88cb7997274de6f9ab6f8a5944748334ce605f60 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -74,7 +74,7 @@ static unsigned blame_copy_score;
 #define BLAME_DEFAULT_MOVE_SCORE       20
 #define BLAME_DEFAULT_COPY_SCORE       40
 
-/* bits #0..7 in revision.h, #8..11 used for merge_bases() in commit.c */
+/* Remember to update object flag allocation in object.h */
 #define METAINFO_SHOWN         (1u<<12)
 #define MORE_THAN_ONE_PATH     (1u<<13)