202 questions
- Bountied 0
- Unanswered
- Frequent
- Score
- Trending
- Week
- Month
- Unanswered (my tags)
1
vote
0
answers
29
views
Can vimdiff do directory diffs? [duplicate]
I've been spoiled by GUI diff tools like meld, kdiff3 etc. Now I'm stuck having to do some git diff'ing via a terminal. If I:
git difftool --tool=vimdiff HEAD~
I get pairs of files which need to be ...
0
votes
1
answer
45
views
How to apply column before vimdiff
if I have 2 files, file_a and file_b, how can I vimdiff the two files after applying column -t to both of them.
0
votes
1
answer
130
views
vimdiff style color question: top & bottom lines
I cannot find what the highlight name (or highlight group) is to change the guifg and guibg colors of the top and bottom lines in vimdiff. (The bottom line above the statusline, that is).
(More ...
0
votes
0
answers
92
views
How to select all the matched files using vimdiff so that non matching files are deled
I have a ligand folder lig1 containing about 2000 files in .pdbqt format like:
compound_117_uff_e=945.53.pdbqt
compound_11800_uff_e=593.20.pdbqt
compound_11801_uff_e=543.18.pdbqt
compound_11802_uff_e=...
1
vote
2
answers
210
views
git diff - git difftool - vimdiff - How to compare two files from column 1 to 72 - It's possible config one of this tools
For mainframe modernization I'm using git to modify my Cobol programs.
To compare two programs one in Dev stage and another in Prod stage, I would like to compare them only from column 1 to 72.
I ...
2
votes
2
answers
2k
views
merge two files with nvim -d or vimdiff
Yesterday the arch community announced the successful migration to git. Congrats at this point.
Reading the news article and the steps to use the new repositories I stumbled over the lines "merge ...
3
votes
1
answer
159
views
git config does not set vimdiff layout properly, git 2.39
I'm trying to configure vimdiff as a git merge tool, so my global git config contains the following lines:
[merge]
tool = gvimdiff
guitool = gvimdiff
[mergetool]
prompt = true
[mergetool &...
3
votes
2
answers
409
views
Defining a shortcut only in vimdiff
I have been using vimdiff in its vimdiff1 layout, where it opens side by side the two buffer of LOCAL and REMOTE. The reason I preferred this layout over the other standard layout is the two shortcuts ...
3
votes
1
answer
73
views
vimdiff: Is there a possibility to find out if the cursor is in a DiffAdd block?
I'm trying to find out in a script if the current cursor position is a block of lines that were added. Is this somehow possible using vim script?
So far I tried to match for the background color of ...
0
votes
0
answers
68
views
vimdiff: Move cursor into a block of deleted lines
When I open two files using vimdiff side by side I cannot put the cursor into a block of deleted lines. vimdiff instead jumps over them. How can I configure vimdiff such that diffs are still side by ...
0
votes
1
answer
358
views
vim search simultaneously across all split files
Is there a way to similary scroll to simultaneously go to next search instance on all split files?
Currently I am using :windo // to search in all splits but pressing "n" only goes to next ...
1
vote
0
answers
200
views
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 ...
0
votes
2
answers
725
views
Is it possible to use the git merge tools on files that contain conflict markers (i.e., `<<<`, `===`, and `>>>`) *outside* a git repo?
Problem description
When merging two branches in git with conflicting files, git adds markers to the conflicting areas.
For example, a file with conflict would look like this
Some code
<<<&...
0
votes
1
answer
948
views
vscode: how to switch window in vimdiff as ctrl+w closes the window
I'm using vimdiff from VSCode's bash terminal. How do I go to the other window in vimdiff. Typically ctrl+w + right/left arrow is used to switch from one side to another. But VSCode capture ctrl+w and ...
4
votes
2
answers
667
views
List pairs of files when using vimdiff as git difftool
I'm using vimdiff as tool when comparing with git difftool.
I want to compare 2 commits with git difftool <commit1> <commit2>.
Today, I have to exit every vimdiff view with :qa to get to ...