add 'make diff' and merge upstream fix for increment value when entering edit mode