Mercurial > hg > ConflictEditor

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 30: (0) -10 -8 +8 +10 tip
age author description
Tue, 20 Sep 2011 16:18:42 +0200 dirk as per Jackson recommendation, don't use Reader objects but instead use just plain input stream
Sun, 18 Sep 2011 19:06:59 +0200 dirk implement resolving the conflict
Sun, 18 Sep 2011 11:28:20 +0200 dirk fix a bug with selection in the differences table
Sun, 18 Sep 2011 11:27:55 +0200 dirk the current conflict is an ObjectNode now so there's less need for casts
Sun, 18 Sep 2011 11:00:16 +0200 dirk wire up the current value, conflict value and preview buttons
Sun, 18 Sep 2011 10:13:48 +0200 dirk pull the buttons into their own panel so they can be activated/deactivated in a single operation
Sun, 18 Sep 2011 09:40:58 +0200 dirk change column names
Sun, 18 Sep 2011 09:37:40 +0200 dirk do not use findValue as it searches recursively. This is not what we want in all the cases findValue was used before.
less more | rev 30: (0) -10 -8 +8 +10 tip