Object Mentor Blog: VIM as a Diff/Merge Tool

VIM as a Diff/Merge Tool

tottinger — Wed, 30 Apr 2008 21:24:00 -0500

Do you need a really quick, clean, powerful diff/merge tool that you can use in windows, mac, and various Unixen? As a happy and pround vim user, I have been enjoying vimdiff for a number of years.

        > gvim -d file1 file2
        > vimdiff file1 file2

(G)vimdiff is wonderful. You can move changes between two versions of a file with great ease (if you know vim) and amazing speed. It can handle files of any size and does a fine job of syncing up both versions.

Vim can do just about anything. I have learned that no matter how much I use and study Vim I still am just scratching the surface of what the editor can do. I find little tricks and configuration options, new keystrokes, and fun little bits of minutae. I think it’s all new. With my memory, sometimes I just think something is new, and have to go check my past notes to see if I already knew it.

Today I (re)learned about diffopt, which makes gvimdiff more wonderful.

    :set diffopt=filler

By default, diffopt is set to “filler”. Filler doesn’t do much, it just adds vertical spaces to keep the text of the left and right pane aligned. It’s a good setting, and I don’t much like working without it. But there are other settings which are overlooked, even by experts.

    : set diffopt+=iwhite

My second favorite is ‘iwhite’, which stands for “ignore whitespace”. It makes gvimdiff ignore leading, trailing, and embedded spaces so that simple acts like retabbing or deleting vertical spaces won’t obscure actual changes. It really helps you to merge changes in situations where you’ve adopted code that was built to entirely different standards.

    :set diffopt+=icase

iCase ignores capitalization, which is not as useful as the other options, since programmers are normally interested in case, but it may be handy when someone has corrected and reformatted SQL. I don’t expect to use it much.

    :set diffopt+=horizontal

The last interesting bit is the choice between vertical splits (the normal case) and horizontal splits (for very long lines on cinema-aspect screens). I hope to never need this option again, but I have needed to deal with absurdly long lines.

If you can use VIM at all, you will find vim’s diffmode to be a very powerful and useful tool. If you can’t use vim already, then maybe vimdiff will be the reason you will learn vim.

"VIM as a Diff/Merge Tool" by ralph lauren

Thu, 02 Feb 2012 02:51:01 -0600

Siècle Série classique américain de los angeles marque Ralph Lauren hommes d’hiver communiqué de 2012, los angeles principale saison des longues de design guy cuir, créateurs intelligents ajouté fermeture éclair dans los angeles couche moyenne de cuir, veste durante cuir cuando longtemps devient instantanément courtroom. Los angeles couleur beige et noir également, put créer united nations design parfait guy scandinaves.http://www.vetementpoloralphlauren2012.net

"VIM as a Diff/Merge Tool" by gucci scarf

Fri, 23 Dec 2011 20:52:10 -0600

you can arrang

"VIM as a Diff/Merge Tool" by tv show reviews

Sun, 04 Dec 2011 04:46:14 -0600

thanks you for the great post!

"VIM as a Diff/Merge Tool" by koko

Fri, 25 Nov 2011 18:38:41 -0600

oakley mens antix sunglassesoakley batwolf sunglassesdiscount oakley batwolf sunglassesoakley batwolf sunglasses saleoakley mens batwolf sunglassesoakley dispatch sunglassesdiscount oakley dispatch sunglassesoakley dispatch sunglasses saleoakley mens dispatch sunglassesoakley fives squared sunglassesdiscount oakley fives squared sunglassesoakley fives squared sunglasses saleoakley mens fives squared sunglassesoakley fuel cell sunglassesdiscount oakley fuel cell sunglassesoakley fuel cell sunglasses saleoakley mens fuel cell sunglassesoakley gascan sunglassesdiscount oakley gascan sunglassesoakley gascan sunglasses saleoakley mens gascan sunglassesoakley half wire sunglassesdiscount oakley half wire sunglassesoakley half wire sunglasses saleoakley mens half wire sunglassesoakley hijinx sunglassesdiscount oakley hijinx sunglassesoakley hijinx sunglasses sale

"VIM as a Diff/Merge Tool" by allen

Fri, 25 Nov 2011 11:41:33 -0600

En mer personlig ljus, men ocks? cool. ralph Lauren detta m?rke ?r verkligen ?lskling de europeiska konsumenterna. Speciellt m?nnen ut av det mer polo Ralph Lauren sweater En herre. N?r ?r det mer viktigt s? att kvaliteten ?r mycket bra, ?r stilen mycket nytt, aldrig inaktuell. Ralph Lauren dress

"VIM as a Diff/Merge Tool" by Cheap Beats By Dr.Dre

Tue, 08 Nov 2011 20:58:47 -0600

The Monster development of the company’s two type of broadband audio line is a series of 400 Interlink MKII a is the M series M550i HR both have distinct style trend here

"VIM as a Diff/Merge Tool" by christian louboutin

Fri, 04 Nov 2011 21:56:20 -0500

Peep toe shoes used to be popular, now it regress popular again. Too heavy and dramatic square toe shoes may be nightmare for many people, but open a mouth in front, the effect will be greatly different. For women, it is a very good transition. It is very trendy, but unlike pointed toe shoe so eye-catching. In this year, a pair of delicate Christian Louboutin Peep Toe Pumps will be a good choice.

Christian Louboutin Madame Butterfly 150 Suede Pumps Red

Technical details of Christian Louboutin Madame Butterfly 150 Suede Pump Red:

Color: Red
Material: Suede
Peep toe
6(150mm) covered heel
1.5(35mm) covered platform

Fashion, delicate, luxurious Christian louboutins shoes on sale, one of its series is Christian Louboutin Peep Toe Pumps, is urbanism collocation. This Christian louboutins shoes design makes people new and refreshing. Red soles shoes is personality, your charm will be wonderful performance.

"VIM as a Diff/Merge Tool" by christian louboutin

Thu, 03 Nov 2011 11:36:20 -0500

These particles scatter away some of the shorter wavelengths of light (the violets and blues), leaving only the longer wavelengths (the oranges and reds.) If an area of high air pressure is present, the air sinks.

"VIM as a Diff/Merge Tool" by christian louboutin

Thu, 03 Nov 2011 11:23:38 -0500

The professional design make you foot more comfortable. Even more tantalizing,this pattern make your legs look as long as you can,it will make you looked more attractive.Moveover,it has reasonable price.If you are a popular woman,do not miss it.

Technical details of Christian Louboutin Velours Scrunch Suede Boots Coffee:

Color: Coffee
Material: Suede
4(100mm) heel
Signature red sole x

Fashion, delicate, luxurious Christian louboutins shoes on sale, one of its series is Christian Louboutin Tall Boots, is urbanism collocation. This Christian louboutins shoes design makes people new and refreshing. Red soles shoes is personality, your charm will be wonderful performance.

"VIM as a Diff/Merge Tool" by UGG Kensington

Tue, 01 Nov 2011 02:26:31 -0500

The autumn collection of UGG Kensington are now in stock . The range features Kensington boots.
UGG Kensington Boots catalog has boots, sneakers and slippers are for everyone that wants to keep warn and dry with the ultimate style. UGGs Kensington are the hot boots right now yet there are lots more Ugg cozy feet products to choose from. The winter season selection has an exiting choice in a number of colors.

Kensington UGG Boots Kensington UGGs are fashionable biker type boots that are amazingly comfy. Totally Kensington UGG, 100 % cool. They really are warm too because the insole is authentic sheepskin and so are the lined uppers. The external soles are a particular EVA with synthetic rubber pod inserts, so no chance of slipping and they last forever too.

"VIM as a Diff/Merge Tool" by jersey size

Sun, 30 Oct 2011 21:05:16 -0500

Should a good collective bargaining agreement in regards to the league’s owners and players be reached rapidly to jersey size conversion set up 4 seasons without delay, the Nets will open Nov. 2 jersey size chart in Washington on the Wizards.

The opener elizabeth Prudential Center enters in the season’s second game 72 hours later, a noon start with the Detroit Pistons.”

Complete jersey sizing project couldn’t be jersey size shot in Oklahoma football jersey size chart City caused by a sizes for jerseys snag with state incentives for film production. Your Louisiana is equipped with an tax credit of 85 cents with a dollar, making a state a premier destination for filming. Oklahoma supplies a 37 percent rebate for companies filming into the state, required . Oklahoma Film & Music Office had already find you have no funding to this particular fiscal year.”

Change would benefit everyone: the NBA, college basketball additionally the players alike.

"VIM as a Diff/Merge Tool" by Adidas Bear Shoes

Mon, 24 Oct 2011 02:19:39 -0500

I guarantee! Precisely what would be the hardships involving your life phone Panda Shoes

"VIM as a Diff/Merge Tool" by Ashley Bowling

Sun, 16 Oct 2011 05:22:54 -0500

"VIM as a Diff/Merge Tool" by moncler jassen

Thu, 06 Oct 2011 10:45:11 -0500

Good moncler jassen online shop,welcome to buy cheap jassen.

"VIM as a Diff/Merge Tool" by forex-tradingtips.org

Wed, 28 Sep 2011 23:39:18 -0500

Wow! I enjoyed reading this blog and i learned a lot! Thanks for sharing this wonderful blog, Keep posting.

"VIM as a Diff/Merge Tool" by authentic coach handbags

Thu, 22 Sep 2011 22:25:39 -0500

authentic coach handbags in the United States market leader at the same time, will also actively committed to the expansion of international market distribution business, authentic coach bags on sale attract overseas consumers. you will like authentic cheap coach handbags.

"VIM as a Diff/Merge Tool" by authentic coach handbags

Thu, 22 Sep 2011 22:24:22 -0500

"VIM as a Diff/Merge Tool" by Wholesale Authentic Jerseys

Mon, 19 Sep 2011 01:37:37 -0500

Finan?ni periskop zadevo z Vzajemno razlo?i kratko in jedrnato:

"VIM as a Diff/Merge Tool" by beats studio by dr dre

Fri, 16 Sep 2011 04:03:31 -0500

come here

"VIM as a Diff/Merge Tool" by abercrombie and fitch

Mon, 05 Sep 2011 07:32:11 -0500

If Abercrombie & Fitch is really concerned that the Situation and company have appeared on air in its garments, it doesn’t appear that angry.Bienvenue pour parcourir Abercrombie France site en ligne, vente en ligne New Style Belstaff en France, vous pouvez acheter la qualite superieure et escompte.Teen apparel retailer Abercrombie & Fitch Co. is offering to pay Michael “The Situation” Sorrentino not to wear its merchandise.Abercrombie Paris est le vêtement de la marque originale et riche d’une histoire enracinee dans le grand air et de la cote Est Ivy League.

"VIM as a Diff/Merge Tool" by beats by dr dre

Mon, 29 Aug 2011 21:09:47 -0500

all those pesky money wasters. Fat, smoker, drinker, heck I am pretty sure us fbeats by dr dre beats by dre saleemales run up more health care bills than you strong dudes.

"VIM as a Diff/Merge Tool" by Crystal Jewellery

Thu, 18 Aug 2011 06:53:16 -0500

Great post! Nice and informative, I really enjoyed reading it and will certainly share this post with my friends . Read everything you ever wanted to know about wedding rings

"VIM as a Diff/Merge Tool" by funny

Mon, 01 Aug 2011 03:52:00 -0500

Excellent. I say tax all those pesky money wasters. Fat, smoker, drinker, heck I am pretty sure us females run up more health care bills than you strong dudes.

"VIM as a Diff/Merge Tool" by good tips

Mon, 01 Aug 2011 03:51:01 -0500

Excellent publish… retain it coming! I only wish there were far more sites like this

"VIM as a Diff/Merge Tool" by beautyblog

Mon, 01 Aug 2011 03:49:05 -0500

Your article is very topical for me. Thanks for the information. I really liked your blog. I add this blog into bookmark. My blog Finace news