9/24/2014

Diff tools: diff, vimdiff, opendiff & twdiff

4 diff tools that can be executed from command line:

  1. diff (/usr/bin/diff): pure CLI with text output, available in any terminals:
    /tmp > diff Hello.java Hello2.java
    
    1c1
    < public class Hello {
    ---
    > public class Hello2 {
    3c3
    <         System.out.println("Hello from " + Hello.class);
    ---
    >         System.out.println("Hello2 from " + Hello2.class);
    

    use -wub option to view contextual diff:
    /tmp > diff -wub Hello.java Hello2.java
    
    --- Hello.java 2014-09-24 13:16:55.000000000 -0400
    +++ Hello2.java 2014-09-24 13:18:01.000000000 -0400
    @@ -1,5 +1,5 @@
    -public class Hello {
    +public class Hello2 {
         public static void main(String[] args) {
    -        System.out.println("Hello from " + Hello.class);
    +        System.out.println("Hello2 from " + Hello2.class);
         }
     }
    

  2. vimdiff (/usr/bin/vimdiff): part of vim, available in any terminals, pure CLI but blocks the current terminal:
    vimdiff Hello.java Hello2.java
    

  3. opendiff (/usr/bin/opendiff): part of Mac OS xcode tools, launches a FileMerge window for diff and merge:  
    opendiff Hello.java Hello2.java
    



  4. twdiff (/usr/local/bin/twdiff): command line tool of TextWrangler, and launches 3 separate TextWrangler windows (left, right and bottom) for diff and merge.
    twdiff Hello.java Hello2.java
    


46 comments:

Anna said...

Great and Useful Article.

Online Java Training

Java Online Training India

Java Online Course

Java EE course

Java EE training

Best Recommended books for Spring framework

Java Interview Questions








Java Course in Chennai

Java Online Training India

Shalini said...

This content creates a new hope and inspiration with in me. Thanks for sharing article like this. The way you have stated everything above is quite awesome. Keep blogging like this. Thanks.

web design company in chennai

Evangeline Mitul said...

I just stumbled upon your blog and wanted to say that I have really enjoyed reading your blog posts. Any way I’ll be subscribing to your feed and I hope you post again soon.

Best Laser Clinic In Chennai

Best Implant Clinic In Chennai

Oracle Fusion said...

Commenting on a blog is an art. Good comments create relations. You’re doing great work. Very nice I really like your blog post as many blogs..........
R12 HRMS Training

Abcya 4 Kids said...

Thank you for sharing them! I hope you will continue to have similar posts to share with everyone!
abcya

Merlin Maarit said...


It is very helpful for me. Keep blogging like this.


Healthcare Analytics Company

Finance Analytics Company

Telecom Analytics Company

Retail Analytics Company

Analytics Company

US IT Staffing Agency

Drag Racer V3 said...

Thanks for sharing article like this. The way you have stated everything above is quite awesome. Keep blogging like this stick-rpg2.com

games draw said...

Thanks for sharing article like this. The way you have stated everything above is quite awesome friv4schoolonline.net

Sowmiya said...


Really Good blog post.provided a helpful information.I hope that you will post more updates like this.
Informatica Training in Chennai

Alice Taylor said...

great article, I was very impressed about it, wish you would have stayed next share

lennyfacetext.com

Thu Lê said...

I was very impressed by this post, this site has always been pleasant news. Thank you very much for such an interesting post. Keep working, great job! In my free time, I like play game: vex3game.com. What about you?

Games 2 Girls said...

Thank you for such a sweet tutorial - all this time later, I've found it and love the end result. I appreciate the time you spent sharing your skills.
run3unblockedgame.com

ngocanhng said...

I like your all post. You have done really good work. Thank you for the information you provide, it helped me a lot. I hope to have many more entries or so from you.
Very interesting blog.
www.baixarfacebookgratis.com.br

hooda said...

This is a great web site. Good sparkling user interface and very informative blogs. I will be coming back in a bit, thanks for the great article. I have found it enormously useful..

abcya

shalu said...

Your post about technology was very helpful to me. Very clear step-by-step instructions.
Informatica Training in Chennai
SAS Training in Chennai
Informatica Training Institute in Chennai

sandy star said...

At this time, it seems like Word Press is the preferred blogging platform available right now. (from what I’ve read) Is that what you’re using on your blog? Great post, however, I was wondering if you could write a little more on this subject?
Best AWS Training in Marathahalli | AWS Training in Marathahalli
Amazon Web Services Training in Anna Nagar, Chennai |Best AWS Training in Anna Nagar, Chennai

sai said...

Thanks Admin for sharing such a useful post, I hope it’s useful to many individuals for developing their skill to get good career.

python training Course in chennai | python training in Bangalore | Python training institute in kalyan nagar

gowsalya said...

Read all the information that i've given in above article. It'll give u the whole idea about it.
Devops Training courses
Devops Training in Bangalore
Best Devops Training in pune
Devops interview questions and answers

Afiah B said...

I am a regular reader of your blog and being students it is great to read that your responsibilities have not prevented you from continuing your study and other activities. Love
Java training in Tambaram | Java training in Velachery

Java training in Omr | Oracle training in Chennai

nivatha said...

I really like the dear information you offer in your articles. I’m able to bookmark your site and show the kids check out up here generally. Im fairly positive theyre likely to be informed a great deal of new stuff here than anyone
Data Science training in kalyan nagar | Data Science training in OMR

Data Science training in chennai | Data science training in velachery

Data science training in tambaram | Data science training in jaya nagar

SRI said...

This is most informative and also this post most user friendly and super navigation to all posts... Thank you so much for giving this information to me.. 

best rpa training in chennai | rpa online training |
rpa training in chennai |
rpa training in bangalore
rpa training in pune
rpa training in marathahalli
rpa training in btm

Unknown said...


Learn about other Apache projects that are part of the Hadoop ecosystem, including Pig, Hive, HBase, ZooKeeper, Oozie, Sqoop, Flume, among others. Big Data University provides separate courses on these other projects, but we recommend you start here.

Bigdata training in Chennai OMR

Anexas Europe said...

I think this is the best article today about the future technology. Thanks for taking your own time to discuss this topic, I feel happy about that curiosity has increased to learn more about this topic.Artificial Intelligence Training in Bangalore. Keep sharing your information regularly for my future reference.

Anexas Europe said...
This comment has been removed by the author.
jaya devan said...

You are doing a great job. I would like to appreciate your work for good accuracy
Regards,
Best Devops Training in Chennai | Best Devops Training Institute in Chennai

manisha said...

Whoa! I’m enjoying the template/theme of this website. It’s simple, yet effective. A lot of times it’s very hard to get that “perfect balance” between superb usability and visual appeal. I must say you’ve done a very good job with this.

apple iphone service center in chennai | apple ipad service center in chennai | apple iphone service center in chennai | | Mac service center in chennai

genga said...

After seeing your article I want to say that the presentation is very good and also a well-written article with some very good information which is very useful for the readers....thanks for sharing it and do share more posts like this.
DevOps Training in Bangalore

DevOps Training in Bangalore

DevOps Training in Bangalore

DevOps Training in Marathahalli

DevOps Training in Pune

DevOps Online Training-gangboard

OLIVIA H said...

Nice blog
apple service center chennai | ipod service center in chennai | Apple laptop service center in chennai | apple iphone service center in chennai | apple iphone service center in chennai

OLIVIA H said...

I greatly appreciate your blog writing,really it’s very pleasure journey and keep sharing is .
apple iphone service center in chennai | imac service center in chennai | ipod service center in chennai | apple ipad service center in chennai

viji said...

This is really impressive post, I am inspired with your post, do post more blogs like this, I am waiting for your blogs.
Regards,
Devops Training in Chennai | Devops Certification in Chennai

mobile application development said...

Amazing Post. Your writing is very inspiring. Thanks for Posting.
Mobile App Development Company in chennai
mobile app development chennai
Mobile application development company in chennai
Mobile application development chennai
Mobile apps development companies in chennai
enterprise mobile app development company

Java application development said...

I have perused your blog its appealing and noteworthy. I like it your blog.
java software development company
Java web development company
Java development companies
java development services
Java application development services

Software development company said...

I have scrutinized your blog its engaging and imperative. I like it your blog.
custom application development services
Software development company
software application development company
offshore software development company
custom software development company

best ppc company in india said...

I have inspected your blog its associating with and essential. I like it your blog.
ppc marketing services
pay per click advertising services
ppc campaign management services
ppc marketing company
ppc management services

shethal v said...

Well somehow I got to read lots of articles on your blog. It’s amazing how interesting it is for me to visit you very often.

devops online training

aws online training

data science with python online training

data science online training

rpa online training

Digitalmarketing said...


I have perused your blog its appealing and noteworthy. I like it your blog.
digital marketing company in chennai,
digital marketing agency in india,
digital marketing company in chennai,
online marketing company in chennai,
digital marketing company in india,
digital marketing services,
digital marketing company,

shivani said...

A bewildering web journal I visit this blog, it's unfathomably heavenly. Oddly, in this present blog's substance made purpose of actuality and reasonable. The substance of data is informative
Oracle Fusion Financials Online Training
Oracle Fusion HCM Online Training
Oracle Fusion SCM Online Training

Rigid Box said...

Information from this blog is very useful for me, am very happy to read this blog Kindly visit us @ Luxury Watch Box | Shoe Box Manufacturer |  Candle Packaging Boxes

shivani said...

A befuddling web diary I visit this blog, it's incredibly grand. Strangely, in this present blog's substance made motivation behind fact and sensible. The substance of information is instructive
Oracle Fusion Financials Online Training
Oracle Fusion HCM Online Training
Oracle Fusion SCM Online Training

Ophelia A. Hazelton said...

We are the world best leading online newspaper portal. You all are the most welcome in our newspaper.If you want to get regular newslatter from our newspaper, please go home page technology news and click the below subscribe button.

Politics News :
Politics at FOX has news, opinion and analysis of American and global politics Find news and video about elections, the White House, the U.N and much more. What You Need To Know About politics news usa.

Business News :
The latest FOX Business News: breaking personal finance, company, View the latest business news latest about the world's top companies, and explore articles on global.

Sports News :
Latest sports news google from around the world with in-depth analysis, features, photos and videos covering football, tennis, motorsport, golf, rugby, sailing, skiing, horse racing and equestrian.

Entertainment News :
View entertainment news headlines today and videos for the latest movie, music, TV and celebrity headlines on worldfoxnews.com

Technology News :
Get the latest FOX technology news education : breaking news and analysis on computing, the web, blogs, games, gadgets, social media, broadband and more.

Science News :
Get the latest FOX science news fox and Environment News: breaking news, analysis and debate on science and nature in the UK and around the world.

Health News :
Get the latest FOX health news report: breaking health and medical news from the UK and around the world, with in-depth features on well-being and lifestyle.

Daily Life :
What You Need To Know About The daily life activities? Get the latest lifestyle news with articles and videos on pets, parenting, fashion, beauty, food, travel, relationships and more on Fox news.

rohini said...

As just as I came to visit your blog ,Now i got lot of experience on this.
Mobile service center in chennai | iphone service center in chennai | ipod battery replacement in chennai | ipad display replacement in chennai | 100% genuine mobile parts | Mobile phone display replacement in chennai | Mobile display replacement in chennai | Mobile service center in chennai | Mobile display replacement in chennai | Tablet battery replacement service in chennai | Latop service center in chennai | Mobile service center in chennai

VRITPROFESSIONALS said...

Nice post. Thanks for sharing! I want people to know just how good this information is in your article. It’s interesting content and Great work.
Thanks & Regards,
VRIT Professionals,
No.1 Leading Web Designing Training Institute In Chennai.

And also those who are looking for
Web Designing Training Institute in Chennai
SEO Training Institute in Chennai
Photoshop Training Institute in Chennai
PHP & Mysql Training Institute in Chennai
Android Training Institute in Chennai

Ophelia A. Hazelton said...

We are best and trusted bangladeshi online news portal website. Everyday we publish the national and international latest news. If you want to get regular newslatter from our newspaper, please go home page BANGLA NEWS and click the below subscribe button.

বাংলাদেশ :
Read Bangla Breaking বাংলাদেশ News on Parliament, Govt, Justice, Road Accident, Cricket, Sports, Education, Business, Agriculture, Population, Dhaka at todaybanglenews.com
রাজনীতি :
বাংলাদেশের রাজনীতির খবর/সংবাদ - Bangladesh Political News। সরকার, বিএনপি/আওয়ামী লীগ/জাতীয় পার্টি/জামায়াত, শেখ হাসিনা/খালেদা জিয়া/এরশাদ, উপজেলা, রাষ্ট্রপতি, ছাত্রলীগ/যুবলীগ/ছাত্রদল/যুবদল/ছাত্র সমাজ বিষয়ক ফিচার at todaybanglenews.com
আন্তর্জাতিক :
আন্তর্জাতিক,Read Bangla Breaking World News on USA, UK, India, Pakistan, Asia, China, Europe, Middle East, Latin America, Africa, Australia, America & UN at todaybanglenews.com
অর্থনীতি :
অর্থনীতি,Read Bangla Breaking World News on USA, UK, India, Pakistan, Asia, China, Europe, Middle East, Latin America, Africa, Australia, America & UN at todaybanglenews.com
ইসলাম ও জীবন :
ইসলাম ও জীবন, রমজান, ইজতেমা, মুসলিম বিশ্ব, মাসআলা-মাসায়েল, ইতিহাস ও ঐতিহ্য, সাক্ষাৎকার, bangladesh news, bangladesh newspaper, bangladesh news paper, bangladeshi newspaper, bangladeshi news paper at todaybanglenews.com
বিনোদন খবর :
বিনোদন খবর ও সংবাদ - Bangla Movie and Entertainment News। ছবি, শুটিং, মঞ্চ, শিল্পী, নাচ বিষয়ক ফিচার। প্রথম আলো, বাংলাদেশের সর্বাধিক পঠিত অনলাইন বাংলা সংবাদপত্র/পত্রিকা at todaybanglenews.com
খেলাধুলা :
খেলার খবর/সংবাদ - খেলাধুলা, ক্রীড়া ও ক্রিকেট - Bangla Sports News। ফুটবল, ক্রিকেট, টেনিস, বিশ্বকাপ, শিরোপা, টি-টোয়েন্টি, বল, সেমি-ফাইনাল, বোলার বিষয়ক ফিচার at todaybanglenews.com
লাইফ স্টাইল :

লাইফ স্টাইল, আমার পরিবার, ভ্রমণ, চাকরির খোঁজ, সমাধান, রান্না, রূপচর্চা, সংবাদ, টিপস, bangladesh news, bangladesh newspaper, bangladesh news paper, bangladeshi newspaper at todaybanglenews.com

Ophelia A. Hazelton said...

Chicken Tikka Masala recipe | healthtipsschool.com

Chicken Tikka is a conventional and very fashionable Indian Chicken recipes which is satisfied full of flavor & color.The word ‘Tikka” means pieces, bits or chunks.

Quick Easy Onion Bhaji Recipe & Cooking Guide Indian Restaurant

Homemade Onion Bhaji are well value the attempt, they are great as a starter for an Indian feast.Onion Bhaji is also identified as Vengaya Baji and also is a type of fritter completed with vegetables, deep fried with experienced batter.

Indian Inspired Lamb Samosa Recipe | healthtipsschool.com

Famous Indian patties through the filling of lamb, vegetables and flavors. A lamb samosa is a fried pastry with a savory filling, such like spiced potatoes, peas, onions,lentils, ground beef ground lamb or ground chicken.Samosas are the triangular doubled and sealed crepe akin to food with filling inside that are deep fried.

King Prawn Butterfly – Indian Restaurant Cooking- IndianFood Made Easy

Peel and take away the veins from the King Prawn Butterfly recipe, create a deep cut along the tummy of the king prawns, open it out and push it down so it becomes level.

How To Make Prawn Puree / Indian Food Cooking | healthtipsschool.com

Prawn puree recipes is most normally served at breakfast otherwise as a snack or light feast. It is habitually served with a curry or bhaji, like in Puree bhaji.

SIMPLE CHICKEN CURRY RECIPE | QUICK & EASY CHICKEN CURRY RECIPE | CHICKEN CURRY FOR BEGINNERS

simple chicken curry recipe is a general delicacy in Southeast Asia, South Asia, as well as in the Caribbean. A distinctive Asian curry consists of chicken stewed in a tomato and onion-based sauce, flavoured with garlic, ginger, chillies and a mixture of spices, often counting cumin, coriander, turmeric, cinnamon, cardamom and so on.

Chicken Bhuna Masala – how to make chicken bhuna masala recipe – tasty Indian recipes

Cheaper than a carry away this delicious chicken bhuna is simple to make which means it is great for a weekend dinner. The solid, medium-hot, sauce prepared from a tasty mix of flavourings and vegetables absolutely coats and greetings the rich meat of chicken thighs. Go here For More how to make chicken bhuna masala recipe.

How to make mutton seekh kabab masala recipe | healthtipsschool.com

A dish consisting of tiny pieces of meat, onions, tomatoes, etc, threaded onto skewers with grilled, usually over charcoal, also called: seekh kabab recipe. These make delicious starters or are superior for a party.

How to make Tandoori Chicken – Tandoori Chicken Restaurant style without oven

Tandoori chicken is a fashionable Indian dish consisting of roasted chicken organized with yogurt and spices. The name comes beginning the type of cylindrical clay oven, a tandoor, in which the dish is habitually arranged. This is an actual way for Tandoori chicken.


Georgina Alexis said...

We are the world best leading online newspaper portal. You all are the most welcome in our newspaper.If you want to get regular newslatter from our newspaper, please go home page business news and click the below subscribe button.

World News :
View CNN world news today for international news and videos from Europe, Asia, Africa, the Middle East and the Americas. Visit CNN News for up-to-the-minute news, breaking news, video, audio and feature stories.

Politics News :
Politics at CNN has news, opinion and analysis of American and global politics Find news and video about elections, the White House, the U.N and much more. What You Need To Know About politics news today.

Business News :
The latest CNN business news today : breaking personal finance, company, View the latest business news about the world's top companies, and explore articles on global.

Sports News :
Latest sports news for today from around the world with in-depth analysis, features, photos and videos covering football, tennis, motorsport, golf, rugby, sailing, skiing, horse racing and equestrian.

Entertainment News :
View entertainment news latest and videos for the latest movie, music, TV and celebrity headlines on usacnnnews.com
Technology News :
Get the latest CNN technology news latest: breaking news and analysis on computing, the web, blogs, games, gadgets, social media, broadband and more.

Health News :
Get the latest CNN health news today : breaking health and medical news from the UK and around the world, with in-depth features on well-being and lifestyle.

Daily Life :
What You Need To Know About The Good Life? Get the latest lifestyle news with articles and videos on pets, parenting, fashion, beauty, food, travel, relationships and more on CNN daily life activities news.

Chloe said...

We reviewed dozens of online dating agencies. Here's our https://wizzlove.com/reviews/victoriamilan-review review.