Meld replaces the default svn diff tool (verified, function OK)

Source: Internet
Author: User
  • Install meld

In Ubuntu, you only need a simple command.

$: Sudo apt-get install meld

  • In the directory ~ /. Subversions/to create the script file mydiff. Sh.

The content is as follows:

#! /Bin/sh

# Configure your favorite diff program here.

# "/Usr/bin/bcompare

Diff = "meld"

# DIFF = "/usr/bin/meld"

# DIFF = "/usr/bin/kompare"

# DIFF = env LANG = zh_CN.UTF-8 WINEPREFIX = "/home/borqs/. wine" wine "C: \ Program Files \ Beyond Compare 2 \ BC2.exe"

# Subversion provides the paths we need as the sixth and seventh

# Parameters.

Left =$ {6}

Right =$ {7}

# Call the diff command (change the following line to make sense

# Your merge program ).

$ Diff $ left $ right

# Return an errorcode of 0 if no differences were detected, 1 if some were.

# Any other errorcode will be treated as fatal.

Return 0

  • Change executable Properties

$: Chmod 777 ~ /. Subversion/mydiff. sh

  • Enable SVN to use meld

Edit "~ /. Subversion:

$ Gedit ~ /. Subversion/config

Change diff-cmd:

Diff-cmd =/home/kaigo/. Subversion/mydiff. Sh

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.