Slide 28
Slide 28 text
/FP7JNͷHJUUPPM
• git [diff/merge]toolΤΠϦΞεΛݟͳ͍
• NeoVimͷvimdiffΛ͏߹ɺ~/.gitconfigʹҎԼ
ͷઃఆ͕ඞཁ
[difftool "vimdiff"]
cmd = "nvim -R -d -c \"wincmd l\" -d \"$LOCAL\" \"$REMOTE\""
[mergetool "vimdiff"]
cmd = "nvim -d -c \"4wincmd w | wincmd J\" \"$LOCAL\" \"$BASE\"
\"$REMOTE\" \"$MERGED\""