Mercurial > hg > ConflictEditor

changeset 24:aa933f4d48e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change column names
author dirk
date Sun, 18 Sep 2011 09:40:58 +0200
parents 8d5f791f1811
children 7593675c1eff
files conflict-editor/src/main/java/de/codedo/conflicteditor/gui/DifferenceTableModel.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/DifferenceTableModel.java	Sun Sep 18 09:37:40 2011 +0200
+++ b/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/DifferenceTableModel.java	Sun Sep 18 09:40:58 2011 +0200
@@ -10,7 +10,7 @@
 
 public class DifferenceTableModel extends AbstractTableModel
 {
-    public static final String[] COLUMN_NAMES = { "Key", "Current value", "Old value" };
+    public static final String[] COLUMN_NAMES = { "Key", "Current value", "Conflict value" };
 
     private List<Difference> _differences;