notes-merge.h   20 builtin/notes.c #include "notes-merge.h"
notes-merge.h   10 notes-merge.c  #include "notes-merge.h"