Mercurial > hg > ConflictEditor

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 35: (0) -30 -10 -3 +3 tip
age author description
Fri, 07 Oct 2011 05:41:53 +0200 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.
Fri, 07 Oct 2011 03:58:41 +0200 dirk replace the text field for the db url with a combo box that is populated from the preferences.
Tue, 20 Sep 2011 17:47:59 +0200 dirk remove the selected conflict after saving - does not fully work yet, e.g. does not proplerly reset the differences table
less more | rev 35: (0) -30 -10 -3 +3 tip