5

我已通过添加以下行将“vimdiff”设置为我的默认 svn-diff 工具~/.subversion/config

diff-cmd = /home/ravikirn/svndiff/diffwrap.sh

diffwrap.sh

!/bin/sh

# Configure your favorite diff program here.
DIFF="/usr/local/bin/vimdiff"

# Subversion provides the paths we need as the sixth and seventh
# parameters.
LEFT=${6}
RIGHT=${7}

# Call the diff command (change the following line to make sense for 
# your merge program).

$DIFF $LEFT $RIGHT

但是,vimdiff 会使用所有难看的颜色来显示差异。我有黑色背景和绿色字体颜色,如何修改 vimdiff 以显示此差异的自定义颜色?我想要一个更愉快的体验。

4

1 回答 1

11

您可以在颜色方案文件中定义颜色。vimdiff 有几个组亮点:

DiffAdd     diff mode: Added line
DiffChange  diff mode: Changed line
DiffDelete  diff mode: Deleted line
DiffText    diff mode: Changed text within a changed line

在编辑颜色方案文件之前,您可以通过在 vim 会话中定义颜色来开始实验,方法如下:

:highlight DiffDelete ctermfg=black ctermbg=yellow 

在你找到你的颜色后,把它们放在你的配色方案中,然后开心。或者只是将您的高亮声明放在“vimrc”中。取决于你喜欢什么。

顺便说一句,你也可以在做差异时切换你的配色方案。例如,如果您在区分时喜欢不同的颜色。这是通过以下方式完成的:

if &diff
    colorscheme some_other_scheme
endif

祝实验顺利

于 2011-01-21T10:51:50.730 回答