vim å èµã® diff ã使ã internal æå®ã¯ diffexpr ãã»ããããã¦ããã¨ç¡è¦ããã¦ãã¾ãã®ã§æ³¨æãã¦ãã ãããã¾ãã algorithm:ã¢ã«ã´ãªãºã å ã«å ãã¦ãå·®åã®ä½ç½®ãæé©åãã indent-heuristic ãæå®ãã¦ããã®ãããããã§ãã ãã diffchar.vim ãã使ãã®å ´åã diffexpr ãã»ãããããªãããã« let g:DiffExpr = 0 ãæ¸ãã¦ããå¿ è¦ãããã¾ãï¼diffchar.vim ã«ã¤ãã¦ã¯å¥éè¨äºãæ¸ãã¦ãã¾ãï¼ã <<<<<<< 2019.01.05 追è¨ããã¾ã§ vimdiff使ã£ã¦ã¾ããï¼å·®åãåãéã«ã¯é常ã«ä¾¿å©ã§ããããgit difftoolã«è¨å®ãã¦ä½¿ã£ã¦ãã人ãå¤ãã¨æãã¾ãããããgit diffã¯å·®åè¨ç®ã®ã¢ã«ã´ãªãºã ãé¸æã§ãã¾ãããvimdiffã¯ããã©ã«ãã§ã¯å·®åè¨ç®ã®ã¢ã«ã´ãªãºã
{{#tags}}- {{label}}
{{/tags}}