on merge tracking

Signed-off-by: Mattias Andrée <maandree@operamail.com>
typo

Signed-off-by: Mattias Andrée <maandree@operamail.com>
m + on empty directories

Signed-off-by: Mattias Andrée <maandree@operamail.com>