update diff-merge & use participle instead of char-by-char while getting inline diff