meld.github.com/features.html at master · meld/meld.github.com · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
---
layout: default
title: Meld - Features
---

<div id="content" class="container_12">

  <div class="grid_5 prefix_1">
    <h2>File comparison</h2>
    <ul>
      <li>Edit files in-place, and your comparison updates on-the-fly</li>
      <li>Perform two- and three-way diffs and merges</li>
      <li>Easily navigate between differences and conflicts</li>
      <li>Visualise global and local differences with insertions, changes and conflicts marked</li>
      <li>Use the built-in regex text filtering to ignore uninteresting differences</li>
      <li>Syntax highlighting</li>
    </ul>
  </div>
  <div class="grid_5 suffix_1">
    <a class="lb" href="images/meld-filediff-full.png" title="Meld file comparison">
    <img style="margin-bottom: 20px;" src="images/meld-filediff.png" width="380" height="309"/>
    </a>
  </div>
  <div class="clear"></div>

  <div class="grid_5 prefix_1">
    <h2>Directory comparison</h2>
    <ul>
      <li>Compare two or three directories file-by-file, showing new, missing, and altered files</li>
      <li>Directly open file comparisons of any conflicting or differing files</li>
      <li>Filter out files or directories to avoid seeing spurious differences</li>
      <li>Simple file management is also available</li>
    </ul>
  </div>
  <div class="grid_5 suffix_1">
    <a class="lb" href="images/meld-dircomp-full.png" title="Meld directory comparison">
    <img style="margin-bottom: 20px;" src="images/meld-dircomp.png" width="380" height="309"/>
    </a>
  </div>
  <div class="clear"></div>

  <div class="grid_5 prefix_1">
    <h2>Version control</h2>
    <ul>
      <li>Meld supports many version control systems, including Git, Mercurial, Bazaar and SVN</li>
      <li>Launch file comparisons to check what changes were made, before you commit</li>
      <li>View file versioning statuses</li>
      <li>Simple version control actions are also available (i.e., commit/update/add/remove/delete files)</li>
    </ul>
  </div>
  <div class="grid_5 suffix_1">
    <a class="lb" href="images/meld-vc-full.png" title="Meld version-control view">
    <img style="margin-bottom: 20px;" src="images/meld-vc.png" width="380" height="309"/>
    </a>
  </div>
  <div class="clear"></div>

  <div class="grid_5 prefix_1">
    <h2>Merge mode (in development)</h2>
    <ul>
      <li>Automatically merge two files using a common ancestor</li>
      <li>Mark and display the base version of all conflicting changes in the middle pane</li>
      <li>Visualise and merge independent modifications of the same file</li>
      <li>Lock down read-only merge bases to avoid mistakes</li>
      <li>Command line interface for easy integration with existing tools, including <code>git mergetool</code></li>
    </ul>
  </div>
  <div class="grid_5 suffix_1">
    <a class="lb" href="images/meld-merge-full.png" title="Meld auto-merge view">
    <img style="margin-bottom: 20px;" src="images/meld-merge.png" width="380" height="236"/>
    </a>
  </div>
  <div class="clear"></div>

  <div class="grid_5 prefix_1">
    <h2>Internationalization support</h2>
    <p>
      Thanks to many translators and the
      <a href="https://live.gnome.org/TranslationProject">GNOME Translation Project</a>,
      Meld is available in many languages. You can check whether your language
      is supported at <a href="http://l10n.gnome.org/module/meld/">Meld's
      translation statistics page</a>.
    </p>
    <p>
      If your language isn't supported, or if you'd simply like to assist with
      translation, you can help out by joining the GNOME Translation project.
    </p>
  </div>
  <div class="grid_5 suffix_1">
  </div>

  <div class="clear"></div>
</div>