On 2020-06-20 23:14, Kunal Chauhan wrote:
> Hi Team,
>
>
> 1.Can vimdiff act like a code merger.
Yes. Lots of options described at
:help merge
> 2. In vimdiff to change color so it will be well visible and is
> there some color code.
The colors rely on your colorscheme. In particular,
Hi Team,
1.Can vimdiff act like a code merger.
2. In vimdiff to change color so it will be well visible and is there some
color code.
3 . Is there some easy method to move text from.one file to another in
vimdiff
Thks
Kunal
--
--
You received this message from the "vim_use" maillist.
Do
On Do, 21 Mär 2019, DwigtArmyOfChampions wrote:
> It probably was Vim airline, but I'm not skilled enough to know for sure.
I doubt it. vim-airline does only provide a statusline, it doesn't know
about cursorline.
Best,
Christian
--
Ist Weltfrieden ohne religiöse Abrüstung überhaupt
On Thursday, March 21, 2019 at 9:45:21 AM UTC-4, Paul wrote:
> On Fri, Mar 15, 2019 at 09:20:12AM -0700, DwigtArmyOfChampions wrote:
> >I’m using vimdiff on a three-way diff. I first open Vim using the command
> >“vimdiff file1.txt file2.txt file3.txt”. I have set cursorline enabled and
> >as I
On Fri, Mar 15, 2019 at 09:20:12AM -0700, DwigtArmyOfChampions wrote:
I’m using vimdiff on a three-way diff. I first open Vim using the command
“vimdiff file1.txt file2.txt file3.txt”. I have set cursorline enabled and as I
arrow down the cursor stays consistent through each of the three
On Saturday, March 16, 2019 at 10:20:15 AM UTC-4, Bram Moolenaar wrote:
> I cannot reproduce the problem. Please give a step-by-step example.
> And what is your Vim version?
>
Vim 8.1. I was able to fix my issue by adding the following to my .vimrc:
" {{{ Vim Diff Options
if
> I’m using vimdiff on a three-way diff. I first open Vim using the
> command “vimdiff file1.txt file2.txt file3.txt”. I have set cursorline
> enabled and as I arrow down the cursor stays consistent through each
> of the three windows. But when I do a diffput on one of the buffers
> the
I’m using vimdiff on a three-way diff. I first open Vim using the command
“vimdiff file1.txt file2.txt file3.txt”. I have set cursorline enabled and as I
arrow down the cursor stays consistent through each of the three windows. But
when I do a diffput on one of the buffers the cursorline is no
Likewise, thanks!
--
--
You received this message from the vim_use maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
vim_use
Justin Keyes wrote:
On Fri, Mar 28, 2014 at 4:53 PM, Josef Fortier josef.fort...@gmail.com
wrote:
I've only really actively used diff mode recently (as opposed to using it
as a visual diff tool). The default folding update on a change has led me
astray more then once.
I've learned
On Sun, Mar 30, 2014 at 10:27 AM, Bram Moolenaar b...@moolenaar.net wrote:
Justin Keyes wrote:
On Fri, Mar 28, 2014 at 4:53 PM, Josef Fortier josef.fort...@gmail.com
wrote:
I've only really actively used diff mode recently (as opposed to using it
as a visual diff tool). The default
On 22:38 Fri 28 Mar , Chris Jones wrote:
On Fri, Mar 28, 2014 at 08:51:48PM EDT, Marcin Szamotulski wrote:
You can easily open all folds with zr.
Or zR..if you have several levels of folding.. ?
CJ
In the diff mode you don't :)
Regards,
Marcin
signature.asc
Description:
On Fri, Mar 28, 2014 at 4:53 PM, Josef Fortier josef.fort...@gmail.com wrote:
I've only really actively used diff mode recently (as opposed to using it as
a visual diff tool). The default folding update on a change has led me astray
more then once.
I've learned the workaround only today, zo
@Justin: You are talking about do/dp, right?
Yep!
I'm motivated by using fugitive for partial commits. I've been burned a few
times, so I really want to be careful. The auto-folding makes it harder to
confirm. zo and zc are better then what I was doing (pretty much what was
suggested, but
are omniscient and do not need to
review.
With the change marker keys, ]c , [c , folding is less important. I can
navigate to a change set, so an ocean of text on the screen is less important.
I suppose if there is a **massive** diffset (in which case vim-diff may not be
the best choice) then the auto
(in which case
vim-diff may not be the best choice) then the auto-folding behavior might be
the correct behavior. But for almost all the scenarios I've been using
diff-mode, the initial folding is as noise free as it needs to be.
Keeping the change markers around also seems nice
On Fri, Mar 28, 2014 at 08:51:48PM EDT, Marcin Szamotulski wrote:
You can easily open all folds with zr.
Or zR..if you have several levels of folding.. ?
CJ
--
--
You received this message from the vim_use maillist.
Do not top-post! Type your reply below the text you are replying to.
For
People,
With two text files open in vertical panels, I would like to be able to
cursor around on the left side file and for the same (or nearly the same
line) to be centred and highlighted on the right side . .
Any gurus who could work out how to do this? - is it even possible in
Vim?
On Saturday, April 13, 2013, Philip Rhoades wrote:
People,
With two text files open in vertical panels, I would like to be able to
cursor around on the left side file and for the same (or nearly the same
line) to be centred and highlighted on the right side . .
Any gurus who could work out
On Sat, Apr 13, 2013 at 07:19:46AM -0400, Salman Halim wrote:
On Saturday, April 13, 2013, Philip Rhoades wrote:
People,
With two text files open in vertical panels, I would like to be able to
cursor around on the left side file and for the same (or nearly the same
line) to be centred
On Sat, Apr 13, 2013 at 2:51 AM, Philip Rhoades p...@pricom.com.au wrote:
People,
With two text files open in vertical panels, I would like to be able to
cursor around on the left side file and for the same (or nearly the same
line) to be centred and highlighted on the right side . .
I am
People,
On 2013-04-14 05:26, Erik Falor wrote:
On Sat, Apr 13, 2013 at 07:19:46AM -0400, Salman Halim wrote:
On Saturday, April 13, 2013, Philip Rhoades wrote:
People,
With two text files open in vertical panels, I would like to be able
to
cursor around on the left side file and for the
David,
On 2013-04-14 06:18, David Fishburn wrote:
On Sat, Apr 13, 2013 at 2:51 AM, Philip Rhoades p...@pricom.com.au
wrote:
People,
With two text files open in vertical panels, I would like to be able
to cursor around on the left side file and for the same (or nearly the
same line) to be
I took a stab at creating a plugin for manual alignment of diffs, but it looks
like there's a bug or undocumented quirk of Vim preventing it from working
correctly in some of the situations where it would be the most useful.
See https://groups.google.com/d/topic/vim_dev/iTOC2rABgxg/discussion
On Tuesday, June 5, 2012 10:10:16 AM UTC-5, Ben Fritz wrote:
I cannot understand what you're trying to show with your examples, but I
THINK from your description that you're looking for a way to manually align
lines in diff mode. As you mention BeyondCompare can do this, as well as
KDiff3
On Jun 6, 6:40 pm, Ben Fritz fritzophre...@gmail.com wrote:
On Tuesday, June 5, 2012 10:10:16 AM UTC-5, Ben Fritz wrote:
I cannot understand what you're trying to show with your examples, but I
THINK from your description that you're looking for a way to manually align
lines in diff mode.
On Wednesday, June 6, 2012 10:57:17 AM UTC-5, sinbad wrote:
ben, yes i was looking at exactly what you explained.
i want to align certain lines in both files. i'm little surprised
that nobody thought of this as there is no plugin available.
thanks for writing the plugin. i'll try out and let
On Jun 6, 10:17 pm, Ben Fritz fritzophre...@gmail.com wrote:
On Wednesday, June 6, 2012 10:57:17 AM UTC-5, sinbad wrote:
ben, yes i was looking at exactly what you explained.
i want to align certain lines in both files. i'm little surprised
that nobody thought of this as there is no plugin
___
21
22 when i take the diff, the diff is as shown below.
23 actually the differnece is from line 5-6 in the first
24 file, its the new if block added, but vim-diff tries to
25 compare line 5-6 of first file with line 17, and shows
26 the diffrences from there on, now i want tell vimdiff
On Tuesday, June 5, 2012 5:52:47 AM UTC-5, sinbad wrote:
21
22 when i take the diff, the diff is as shown below.
23 actually the differnece is from line 5-6 in the first
24 file, its the new if block added, but vim-diff tries to
25 compare line 5-6 of first file with line 17, and shows
Am 03.10.2010 17:49, schrieb Sammi:
Do I need open two files in vim or use vimdiff command?
You should drop diffbyline.vim into your plugin folder to make the
DiffLineByLine() function available after startup.
Within Vim, execute
:SetLineByLineDiff
which is a shortcut for :set
Do I need open two files in vim or use vimdiff command?
On Oct 2, 7:57 am, Andy Wokula anw...@yahoo.de wrote:
Am 24.08.2010 04:31, schrieb rudy b:
Hi,
I have a question about diff.
I've always found diff very powerful, and I've never had any issue
with this commad.
Expect that I
Am 24.08.2010 04:31, schrieb rudy b:
Hi,
I have a question about diff.
I've always found diff very powerful, and I've never had any issue
with this commad.
Expect that I encoutered a problem, that I wish diff would be just
slightly more flexible.
Usually diff is very smart in aligning the
Hi,
I have a question about diff.
I've always found diff very powerful, and I've never had any issue
with this commad.
Expect that I encoutered a problem, that I wish diff would be just
slightly more flexible.
Usually diff is very smart in aligning the lines in a way to
optimise its match.
Is
i have a file with diff in vim shown as below
1.old 1.new
abc | foo
dce | bar
--- | ---
--- | ---
--- | ghi
foo| jkl
bar| mno
foo, bar are out of aligned because of some changes in file 1.new;
now i want to realign foo in 1.old to foo in 1.new and start diffing
from
On 2009-08-10, sinbad wrote:
i have a file with diff in vim shown as below
1.old 1.new
abc | foo
dce | bar
--- | ---
--- | ---
--- | ghi
foo| jkl
bar| mno
foo, bar are out of aligned because of some changes in file 1.new;
now i want to realign foo in 1.old
Is it possible to configure Diff mode so that you can cursor through
lines in a deleted region in either the LEFT or RIGHT window?
I'm thinking of something like the 'virtualedit' option.
For example, say I was editing the RIGHT window of this diff.
This is going to look bad if not viewed with a
Hi,
Noah wrote:
Is it possible to configure Diff mode so that you can cursor through
lines in a deleted region in either the LEFT or RIGHT window?
I'm thinking of something like the 'virtualedit' option.
For example, say I was editing the RIGHT window of this diff.
This is going to look
38 matches
Mail list logo
