Mercurial > hg > ConflictEditor

changeset 37:76b2dafcb1b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a comment why we discard the index here
author dirk
date Fri, 07 Oct 2011 05:59:38 +0200
parents 8262e3a8ed6f
children 6c85a4fcfe28
files conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditor.java
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditor.java	Fri Oct 07 05:55:30 2011 +0200
+++ b/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditor.java	Fri Oct 07 05:59:38 2011 +0200
@@ -97,6 +97,8 @@
             @Override
             protected void execute(int index) throws Exception
             {
+                // do not use the selection here ... it is wrong in case the selection is cleared in
+                // the list
                 selectConflictDocument();
             }
         };