Mercurial > hg > ConflictEditor

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 38: (0) -30 -10 -6 tip
age author description
2011-10-09 Dirk Olmes add a toplevel pom, make this a reactor build
2011-10-07 dirk add a comment why we discard the index here
2011-10-07 dirk do not use the selection index in conflict list from the event, get it from the list instead. If the selection is cleared in the list, the event will report a wrong index.
2011-10-07 dirk do not use a custom combo box model, instead fill a default one from preferences and attach an action listener to the combo that ensures that yet unknown database URLs will be stored in preferences.
2011-10-07 dirk replace the text field for the db url with a combo box that is populated from the preferences.
2011-09-20 dirk remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
less more | rev 38: (0) -30 -10 -6 tip