diff: add annotate action to diff viewers
[idea/community.git] / platform / diff-impl / src / com / intellij / diff / merge /
2015-09-02 Yaroslav LepenkinMerge branch 'chainedMethodsWithComments' of https...
2015-09-01 Pap Lőrinc[groovy] fix spockTableWithComments (IDEA-137145)
2015-08-31 Dmitry TrofimovMerge branch 'traff/sdks'
2015-08-31 irengrigMerge remote-tracking branch 'origin/master'
2015-08-31 Aleksey Pivovarovdiff: cleanup
2015-08-27 Ilya.KazakevichMerge remote-tracking branch 'origin/master'
2015-08-27 Aleksey Pivovarovdiff: allow to pass additional actions via action group
2015-08-25 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-08-25 Vladimir.OrlovMerge remote-tracking branch 'origin/master'
2015-08-25 Aleksey Pivovarovmerge: fix NPE if UndoManager not found appcode/142.4266 clion/142.4264
2015-08-25 Vladimir Krivosheevfix NPE if MultipleFileMergeDialog was created without...
2015-08-24 Ekaterina TuzovaMerge branch 'liana/simplified_debugger'
2015-08-24 Egor.UshakovMerge branch 'master' into nodeDescriptor_names_ext
2015-08-20 irengrigMerge remote-tracking branch 'origin/master'
2015-08-20 Dmitry TrofimovMerge remote-tracking branch 'origin/master'
2015-08-20 Aleksey PivovarovMerge branch 'new-merge'
2015-08-19 Aleksey PivovarovMerge branch 'master' into new-merge
2015-08-12 Aleksey Pivovarovmerge: register undo/redo actions in side editors
2015-08-12 Aleksey Pivovarovmerge: restore 'old-style' apply actions
2015-08-12 Aleksey Pivovarovmerge: remove "append side" actions
2015-08-12 Aleksey Pivovarovmerge: remove registry key
2015-08-12 Aleksey Pivovarovmerge: show confirmation on cancel in binary merge...
2015-08-12 Aleksey Pivovarovmerge: ask on selecting left/right side, discarding...
2015-08-12 Aleksey Pivovarovmerge: let MergeTool to decide on confirmation message
2015-08-12 Aleksey Pivovarovmerge: show "Accept Left/Right" actions in ErrorMergeTool
2015-08-12 Aleksey Pivovarovmerge: limit bottom actions to the four default ones
2015-08-12 Aleksey Pivovarovmerge: move applyResult() to the MergeRequest
2015-08-10 Aleksey Pivovarovmerge: show gutter actions in DumbMode
2015-08-10 Aleksey PivovarovMerge branch 'master' into new-merge
2015-08-06 Aleksey Pivovarovmerge: reduce visibility
2015-08-06 Aleksey Pivovarovmerge: implement two-step conflict resolve mode
2015-08-03 Aleksey Pivovarovmerge: replace modal Yes/No dialog with notification
2015-07-29 Aleksey Pivovarovmerge: support Undo actions
2015-07-29 Aleksey Pivovarovmerge: introduce state for merge changes
2015-07-29 Aleksey Pivovarovmerge: move field
2015-07-29 Aleksey Pivovarovmerge: move method
2015-07-29 Aleksey Pivovarovmerge: allow to mark resolved changes as unresolved
2015-07-29 Aleksey PivovarovMerge branch 'master' into new-merge
2015-07-28 Aleksey Pivovarovmerge: avoid "Read Only" caption for base content
2015-07-28 Aleksey Pivovarovmerge: mark initial merge content as nonundoable action
2015-07-15 Aleksey Pivovarovmerge: do not mark deletions as resolved on "append...
2015-07-15 Aleksey Pivovarovmerge: cleanup
2015-07-15 Aleksey Pivovarovmerge: allow to resolve conflict "unchanged - modified...
2015-07-15 Aleksey Pivovarovmerge: allow to resolve changes with keyboard
2015-07-15 Aleksey Pivovarovmerge: add change-apply actions to editor menu
2015-07-15 Aleksey Pivovarovdiff: extract util method
2015-07-15 Aleksey Pivovarovmerge: do not show "append" chevron action for non...
2015-07-15 Aleksey Pivovarovmerge: finish current activities before showing confirm...
2015-07-15 Aleksey Pivovarovmerge: allow to add MergeTool via extension point
2015-07-15 Aleksey Pivovarovmerge: NotNull
2015-07-15 Aleksey Pivovarovmerge: use default DialogWrapper bottom actiond
2015-07-15 Aleksey Pivovarovmerge: require confirmation on undoing initialization...
2015-07-15 Aleksey PivovarovIDEA-23756 merge: add "apply non-conflicted changed...
2015-07-15 Aleksey Pivovarovmerge: show "cancel change" action the middle editor
2015-07-15 Aleksey Pivovarovmerge: move bottom action panel creation into MergeRequ...
2015-07-15 Aleksey Pivovarovmerge: exit from bulk block in finally section
2015-07-15 Aleksey Pivovarovmerge: propose to accept results on resolving last...
2015-07-15 Aleksey Pivovarovmerge: allow to accept single side of change
2015-07-15 Aleksey Pivovarovmerge: extract method
2015-07-15 Aleksey Pivovarovmerge: do not count resolved changes on status bar
2015-07-15 Aleksey Pivovarovmerge: destroy changes before applying request
2015-07-15 Aleksey Pivovarovmerge: avoid reinstalling highlighters on every change
2015-07-15 Aleksey Pivovarovmerge: add "Apply non-conflicted changes" action
2015-07-15 Aleksey Pivovarovmerge: cleanup
2015-07-14 Aleksey Pivovarovmerge: include inserted text into change range
2015-07-14 Aleksey Pivovarovmerge: set default window action
2015-07-14 Aleksey Pivovarovmerge: add navigation actions
2015-07-14 Aleksey Pivovarovmerge: implement dotted painting of applied ranges
2015-07-14 Aleksey Pivovarovmerge: allow to apply selected side of change
2015-07-14 Aleksey Pivovarovmerge: init merge using new diff API