Giter Club home page Giter Club logo

meld's Introduction

About Meld

Meld is a visual diff and merge tool targeted at developers. Meld helps you compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories, and supports many version control systems including Git, Mercurial, Bazaar and Subversion.

Meld helps you review code changes, understand patches, and makes enormous merge conflicts slightly less painful.

Meld is licensed under the GPL v2 or later.

Requirements

  • Python 2.7
  • GTK+ 3.14
  • GLib 2.36
  • PyGObject 3.8
  • GtkSourceView 3.14

Running

Meld can be run directly from this directory. Just type:

  • bin/meld

Alternatively, you can install Meld system-wide by running:

  • python setup.py install

or if you're on Ubuntu, instead try:

  • python setup.py install --prefix=/usr

...but you should probably just get a RPM/deb/installer instead, depending on your system. Meld packages are available for just about every *nix distribution.

For Windows users, MSIs are available from the Meld home page.

For OSX users, Meld can be installed on OSX using MacPorts/Fink/etc. There are also unofficial native builds available for older releases. See the wiki for details.

Building

Meld uses standard distutils for building. It supports anything that distutils supports, and little else.

Additional hacks are added to make life easier for packagers where required, such as:

  • Passing --no-update-icon-cache will stop Meld from running gtk-update-icon-cache post-install
  • Passing --no-compile-schemas will stop Meld from trying to compile gsettings schemas post-install

These arguments need to be passed to setup.py itself, not to the install command. In other words, do this:

python setup.py --no-compile-schemas install

not this:

python setup.py install --no-compile-schemas

Contacting

Home page: http://meldmerge.org

Documentation: http://meldmerge.org/help

Wiki: https://wiki.gnome.org/Apps/Meld

Mailing list: https://mail.gnome.org/mailman/listinfo/meld-list

meld's People

Contributors

kaiw avatar piotrdrag avatar dmustieles avatar marv-cz avatar vincele avatar kelemeng avatar mirosnik1 avatar claudep avatar frandieguez avatar zppp1 avatar takeshi-aihana avatar yousseb avatar pmkovar avatar annoab avatar atriwidada avatar mtrmac avatar yeager avatar milocasagrande avatar fdillanes avatar psykar avatar janderssonse avatar sandrobonazzola avatar enrico-br avatar dimstar77 avatar auge avatar haaninjo avatar nazgul77 avatar evfool avatar rffontenelle avatar filmsi avatar

Watchers

James Cloos avatar Danny Guo avatar  avatar

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.