Mercurial > hg > ConflictEditor

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 17: (0) -10 -8 +8 +10 tip
age author description
2011-09-17 dirk tighten up checks
2011-09-17 dirk clean code!
2011-09-16 dirk generate differences for missing keys either in the original document or in the conflicting document.
2011-09-16 dirk implement a test case for DocumentMatcher that covers the currently implemented cases
2011-09-13 Dirk Olmes add button panel
2011-09-13 Dirk Olmes clean code: pull build/create methods apart
2011-09-13 Dirk Olmes switch to GridBagLayout
2011-09-13 Dirk Olmes clean up: ConflictEditor should only contain code that mediates between the various GUI elements. The logic for dealing with conflicts moves to ConflictEditorController.
less more | rev 17: (0) -10 -8 +8 +10 tip