Stack Overflow
Stack Overflow

Questions tagged [vimdiff]

vimdiff is a vim mode that can show differences between two, three or four files.

vimdiff is the same as vim -d or using :diffthis on several windows in the same vim tab.

Use dp to propagate a difference and do to get it, ]c and [c to navigate between differences.

202 questions
2
votes
1 answer

obtaining multiple changes at once using vimdiff

I'm using vimdiff to merge a changes from another group's file into our file. Not all changes should be accepted, so I have to do it manually. However, I was wondering if there is a way to tell vimdiff to accept several changes at once. i.e. instead…
user2307618
  • 23
  • 4
2
votes
1 answer

View "cvs diff" output in two columns with vim

I have "cvs diff" output (for all files in project) in unified diff format. Format could be like this: Index: somefile.cpp =================================================================== RCS file: /CVS_repo/SomeProject/somefile.cpp,v retrieving…
Avega
  • 186
  • 11
1
vote
0 answers

iTerm2: What is the best way to compare / diff two panes (like vimdiff)?

I would like to compare two panes in iTerm2, like I can do it in vimdiff. (Or is it the best way to do it in vimdiff, not using iTerm2 panes??) – I couldn't find anything in the documentation. – And how can I search the iTerm documentation – – only…
Detlef Lindenthal
  • 45
  • 7
1
vote
1 answer

Is there a way to stop `git diff-tool` when return code is non-zero from the diff-tool is non-zero

I am aware of the git config option difftool.prompt true However, I am wondering if there is a way to stop diffing when return code is non-zero. I am using vim as diff-tool and if I exit using :cq it will return non-zero but the default settings of…
I J
  • 47
  • 6
1
vote
2 answers

VimDiff as Git MergeTool : How To resolve all merge conflicts with changes from LOCAL,BASE or REMOTE with one command?

I want to know : How To resolve all merge conflicts with changes from LOCAL,BASE or REMOTE with one command ? This must be possible right ? I am struggling with this for 2 hours now.... Or is there even a possibility without vimdiff ? thank you
Fakultativ Parasit
  • 36
  • 3
1
vote
1 answer

How can I use git difftool on a patch file?

As the opening title suggests, I am trying to produce a side-by-side diff using git difftool. I am in an environment s.t. vimdiff is the only available tool on these computers and am using CLI commands to do code reviews. If I have the head/origin…
CaffeineDependent
  • 97
  • 1
  • 9
1
vote
2 answers

How to run vimdiff from a python daemon

I've been having some problems with vimdiff, python and daemons. The thing is, I cannot use vimdiff with python when running the program as a daemon, I don't know what happens it just doesn't generate the diff.html file. It's not a permission…
diegofelipe01
  • 11
  • 1
1
vote
1 answer

Configuring vimdiff splits with specific statusline / line-numbers

I'm trying to set up git mergetool to spawn vimdiff with the following splits (and a configuration customized to each split): Splits from the following buffers $LOCAL, $BASE, $REMOTE, & $MERGED (horizontal) [done] Show line-numbers per split…
Mike Pennington
  • 41,899
  • 19
  • 136
  • 174
1
vote
1 answer

How to make "git difftool --dir-diff" working with vim

I am happy working with git difftool --dir-diff with beyond compare to show overall diff across directories and files and navigate through them. However when it comes to vimdiff, seems it do not support dir diff from git. A git alias I created is as…
Eric Sun
  • 777
  • 6
  • 20
1
vote
1 answer

How find word differences in files with very big lines

My question is if there is a tool in linux to find the difference in two files with lines so big as 39604 chars. I tried with vimdiff, kompare, diff, colordiff, wdiff and other tools and none of them show me the exact difference. All of them show…
oml
  • 115
  • 2
  • 8
1
vote
1 answer

using vimdiff in git-merge, how can I show the commit ids?

I am doing a cherry-pick that resulted in a merge conflict and when I resolve it, the default merge tool, Vimdiff, is opened. With 4 panes, the top being the Local , base , and remote. However I noticed the base doesn't have the version of the file…
dgunc
  • 25
  • 2
1
vote
1 answer

How can I merge two lines from one revision and a third from the other in vimdiff?

I am merging two git branches together. I am using vimdiff to do this, so there are three vim panes shown in my terminal. This same conflict arises hundreds of times in my merge: Every time I come across it, I want to do the same thing: keep the…
whatscool
  • 317
  • 2
  • 18
1
vote
0 answers

Why navigate to other windows in vimdiff?

If I understand correctly, (when using git mergetool with vimdiff and diff3 configured) only the MERGE version at the bottom is editable, in that saving changes here will result in a change to the working tree in the target branch. The commands…
jsstuball
  • 4,104
  • 7
  • 33
  • 63
1
vote
2 answers

Can we execute vim commands from a shell script inside jenkins?

I have a @Test method written in java which calls a shell script. The shell script contains vimdiff command used for generating code comparison between two html files. When I run this test method from jenkins, the shell script is getting executed.…
Kishore Mohanavelu
  • 439
  • 1
  • 6
  • 17
1
vote
1 answer

How to alter context ("unified") on `git difftool`?

I tried -U9("--unified") and git config --global diff.context - it affects only git diff but neither git difftool (I prefer vimdiff) nor git commit -p (commit by hunks).
Vitaly Zdanevich
  • 13,032
  • 8
  • 47
  • 81
1 2 3
…
13 14