[Vim]vimdiffã§å·®åˆ†ã‚’表示・マージã—ã¦å…ƒãƒ•ã‚¡ã‚¤ãƒ«ã¨ã®å·®åˆ†ã‚’確èªã™ã‚‹ã‚ˆã vimdiff ã§å·®åˆ†ã‚’å–ã‚‹ã®ã ã‘ã‚Œã©ãƒžãƒ¼ã‚¸ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’忘れã¦ã—ã¾ã†ã®ã§å‚™å¿˜éŒ²ã€‚ vimdiff file1 file2 ã¾ã‚ã€ã“ã‚Œã¯åŸºæœ¬ã€‚ åˆæœŸè¨å®šã® vimdiff ã®é…色ã¯ã™ã”ãç›®ã«æ‚ªã„æ„Ÿã˜ã ã£ãŸã®ã§ .vimrc ã«ä»¥ä¸‹ã®è¨å®šã‚’ã—ãŸã€‚ hi DiffAdd ctermfg=black ctermbg=2 hi DiffChange ctermfg=black ctermbg=3 hi DiffDelete ctermfg=black ctermbg=6 hi DiffText ctermfg=black ctermbg=7å‚考: ãã‚“ãªåƒ•ã‚‰ã¯ã‚³ãƒ”ペプãƒã‚°ãƒ©ãƒžãƒ¼ï¼: vi・vim : vimdiffã®è‰²è¨å®š ココã‹ã‚‰å·®åˆ†ã‚’確èªã—ã¦ãƒžãƒ¼ã‚¸ã—ã¦ã„ãã«ã¯ãƒžãƒ¼ã‚¸ã—ãŸè¡Œã«ã‚«ãƒ¼ã‚½ãƒ«ã‚’åˆã‚ã›ã‚‹å¿…è¦ãŒã‚る。 å¹ã出ã—ã®æ ¹æœ¬ãŒã‚«ãƒ¼ã‚½ãƒ«ã®ã‚ã‚‹ç”»é¢ã€‚ æ–°è¦è¡Œã®å³æ–¹å‘ã®ãƒžãƒ¼ã‚¸å·¦ç”»é¢ã®æ–°è¦è¡Œã«ã‚«ãƒ¼ã‚½ãƒ«ã‚’
![[Vim]vimdiffã§å·®åˆ†ã‚’表示・マージã—ã¦å…ƒãƒ•ã‚¡ã‚¤ãƒ«ã¨ã®å·®åˆ†ã‚’確èªã™ã‚‹](https://cdn-ak-scissors.b.st-hatena.com/image/square/2a8551114a65d2ba8f87d29bbb3d01f9cb0086e0/height=288;version=1;width=512/https%3A%2F%2Fblogger.googleusercontent.com%2Fimg%2Fb%2FR29vZ2xl%2FAVvXsEh9kvJ0jkWdeO58grcfL_us8HWm33D7_rq1UenVAfndLTaqU2UxFZ6Z_ZlkXbhKIIahHZPFwAFzJJL4wWzsRhwxqbvyxh8n4Durmv4IQy00QFykMtzaU2f0il6AzmlKgFljHemIpqOQK94%2Fw1200-h630-p-k-no-nu%2Fvimdiff.png)
{{#tags}}- {{label}}
{{/tags}}