GithubHelp home page GithubHelp logo

isabella232 / meld Goto Github PK

View Code? Open in Web Editor NEW

This project forked from gnome/meld

1.0 1.0 0.0 16.52 MB

Read-only mirror of https://gitlab.gnome.org/GNOME/meld

Home Page: https://gitlab.gnome.org/GNOME/meld

License: GNU General Public License v2.0

Python 97.60% CSS 0.32% Shell 0.45% Roff 0.40% Makefile 0.08% Meson 1.15%

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, CVS 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 3.6
  • pycairo (Python3 bindings for cairo without GObject layer)
  • PyGObject 3.30 (Python3 bindings for GObject introspection)
  • gsettings-desktop-schemas

And following packages with GObject introspection:

  • GLib 2.36
  • Pango
  • PangoCairo
  • GTK+ 3.20
  • GtkSourceView 4.0

Build requirements

  • Python 3.6
  • Meson 0.48
  • Ninja
  • gettext
  • GLib 2.36 and its development utilities such as glib-compile-schemas

For Windows build requirements, see mingw-common section .gitlab-ci.yml

Running

You do not need to build Meld in order to run it. Meld can be run directly from this source directory by running:

$ bin/meld

Unix users should get Meld from their distribution package manager, or from Flathub.

Windows users should download the provided MSIs on the Meld home page.

OSX users can install Meld using Homebrew (or Macports, Fink, etc.), or there are unofficial native builds available from the Meld for OSX project.

Building

Meld uses meson build system. Use the following commands to build Meld from the source directory:

$ meson _build
$ cd _build
$ ninja

You can then install Meld system-wide by running:

$ ninja install

A Windows installer can be built with command

C:\Python34\python.exe setup_win32.py bdist_msi

which will create the file dist/Meld-VERSION-ARCH.msi.

Developing

It's easy to get started developing Meld. From a git checkout, just run bin/meld.

We also support development using Flatpak via GNOME Builder. At the Builder "Clone..." dialog, enter https://gitlab.gnome.org/GNOME/meld.git, and the default build + run development flow using Flatpak should work.

Contributing

Meld uses GNOME's GitLab to track bugs, and user questions and development discussions happen on the Meld mailing list. The development team is small, and new contributors are always welcome!

List of issues: https://gitlab.gnome.org/GNOME/meld/issues

Support forum: https://discourse.gnome.org/tag/meld

Links

Home page: http://meldmerge.org

Documentation: http://meldmerge.org/help

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

meld's People

Stargazers

 avatar

Watchers

 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.