I'm using diff mode to do 3way merging.
I'm using git and recently hit the same issue.
I suggest using this script: CVSconflict.vim
http://vim.sourceforge.net/scripts/script.php?script_id=1370
Excellent work from Charles E. Campbell, as usual ;-)
Ah, I didn't know that script. It
On Sun, 25 Nov 2007 21:55:01 -0800, Mark Waggoner
[EMAIL PROTECTED] wrote:
I just thought I'd update this thread to note that I've been using vim with
this patch for the last month or so, and have not encountered any problems.
I can't say that I stress the handling of tabs to an extraordinary
[Didn't get any acknowledgement of this; resending. For the to do
list perhaps, Bram?]
vim -u NONE
iA sentence.Esc)
The cursor is placed beyond end of line despite virtualedit being
blank.
I just tried it and saw no problem -- the cursor was atop the
. (using
either vim or
Patch 7.1.160
Problem:When a focus autocommand is defined, getting or losing
focus
causes the hit-enter prompt to be redrawn. (Bjorn Winckler)
Solution: Overwrite the last line.
If you do `:intro` and lose or gain focus, the problem still happens.
Nico
Ben Schmidt wrote:
:help :sort|/first number
The documentation reads
To sort on the first number in the line, no matter
what is in front of it:
:sort /.*\ze\d/
which is clearly wrong. As * is greedy,
Charles E Campbell Jr wrote:
Ben Schmidt wrote:
[Didn't get any acknowledgement of this; resending. For the to do list
perhaps, Bram?]
vim -u NONE
iA sentence.Esc)
The cursor is placed beyond end of line despite virtualedit being blank.
I just tried it and saw no problem -- the
Nico Weber wrote:
Patch 7.1.160
Problem:When a focus autocommand is defined, getting or losing
focus
causes the hit-enter prompt to be redrawn. (Bjorn Winckler)
Solution: Overwrite the last line.
If you do `:intro` and lose or gain focus, the problem still happens.
not for me, on gvim 7.1.162 for GTK2/Gnome2: I see a single hit-
Enter line as
soon as I use :intro and I never see a second one, even after
losing and
regaining focus. (I could see it in versions earlier than 7.1.160.)
Is your window large enough so that the hit enter prompt is not in
Nico Weber wrote:
not for me, on gvim 7.1.162 for GTK2/Gnome2: I see a single hit-
Enter line as
soon as I use :intro and I never see a second one, even after
losing and
regaining focus. (I could see it in versions earlier than 7.1.160.)
Is your window large enough so that the hit
Dasn wrote:
On 26/11/07 22:19 +0100, Tony Mechelynck wrote:
no; but even without them, I used to see duplicate hit-Enter lines sometimes
when regaining focus. Now I don't. Maybe only part of the problem got solved
by the patch?
Nico
Best regards,
Tony.
I can reproduce it with:
$ vim
10 matches
Mail list logo
