Merge branch 'master' into multiroot_branch
[idea/community.git] / plugins / git4idea / src / git4idea / merge / GitMergeProvider.java
2012-01-17 Kirill LikhodedovMerge branch 'master' into multiroot_branch
2012-01-17 Kirill LikhodedovMove GitUtil, GitFileUtils, StringScanner, GitUIUtil...
2012-01-13 Dmitry JemerovMerge remote branch 'origin/master'
2012-01-13 Evgeny ZakrevskyIDEA-78992 Columns in "Files Merged with Conflicts...
2011-10-12 nikMerge /home/nik/work/jpsImport/JPS
2011-10-10 irengrigIDEA-75333 Git: update with merge: wrong remote revisio... cidr/109.20
2011-10-09 irengrigIDEA-75333 Git: update with merge: wrong remote revisio... idea/110.78 pycharm/110.76 rubymine/110.77 storm/110.75
2011-06-17 Anton MakeevMerge remote-tracking branch 'origin/master'
2011-06-10 irengrigVCS: content revision cache on SLRUMap
2011-05-10 Kirill KalishevMerge branch 'master' of git@git.labs.intellij.net...
2011-05-06 Eugene KudelevskyMerge commit 'origin/master'
2011-05-06 Kirill Likhodedov[Git] Made rev-list and ls-files commands silent.
2011-04-26 Kirill KalishevMerge branch 'master' of git@git.labs.intellij.net...
2011-04-26 Kirill LikhodedovMoved several utility methods from GitFileUtils & GitUt...
2011-03-29 Eugene KudelevskyMerge commit 'origin/master'
2011-03-28 sweinreuterMerge branch 'master' of git.labs.intellij.net:idea...
2011-03-27 Kirill LikhodedovMerge branch '106.164'
2011-03-20 Kirill LikhodedovIDEA-55352 See file content in modify-delete or delete...
2010-07-19 Yann CébronMerge branch 'master' of git.labs.intellij.net:idea...
2010-07-14 irengrigMerge branch 'master' of git.labs.intellij.net:idea...
2010-07-06 Kirill KalishevMerge branch 'master' of git@git.labs.intellij.net...
2010-07-06 Eugene KudelevskyMerge branch 'master' of git@git.labs.intellij.net...
2010-07-06 Kirill LikhodedovMerge branch 'master' of git.labs.intellij.net:idea...
2010-07-05 Constantine Plotnikovgit4idea: IDEA-56209 IDEA-51045 fixed merge sides in...
2010-05-29 Maxim MedvedevMerge branch 'master' into changeSignature
2010-05-27 Yann CébronMerge branch 'master' of git.labs.intellij.net:idea...
2010-05-27 irengrigMerge branch 'master' of git.labs.intellij.net:idea...
2010-05-27 Kirill KalishevMerge branch 'master' of git@git.labs.intellij.net...
2010-05-27 Constantine Plotnikovgit4idea: IDEA-51195: added support for a large number...
2010-01-18 Dmitry Jemerovmerge idea90 branch into trunk
2010-01-16 Yann CébronMerge branch 'master' of git.labs.intellij.net:idea...
2010-01-15 Kirill.SafonovMerge branch 'master' of git.labs.intellij.net:idea...
2010-01-14 irengrigMerge branch 'master' of git.labs.intellij.net:idea...
2010-01-14 Kirill KalishevMerge branch 'master' of git@git.labs.intellij.net...
2010-01-14 Kirill KalishevMerge branch 'master' of git@git.labs.intellij.net... 94.116
2010-01-13 Constantine Plotnikovgit4idea: Added read/write locking functionality to...
2009-10-12 Kirill KalishevMerge branch 'tree-ui'
2009-10-12 Maxim MedvedevMerge branch 'master' of git.labs.intellij.net:idea...
2009-10-11 Yann CébronMerge branch 'master' of git.labs.intellij.net:idea...
2009-10-11 Dmitry Jemerovupdate copyright
2009-09-28 Constantine PlotnikovMerged SVN plugins IMPORTED
2009-05-18 Constantine Plotnikovgit4idea: IDEADEV-33099: non-git files are now handled...
2009-05-14 Constantine Plotnikovgit4idea: IDEADEV-36261: removed unneeded project argum...
2009-05-13 Constantine Plotnikovgit4idea: fixed many spelling and javadoc comments...
2009-01-29 Constantine Plotnikovgit4idea: IDEADEV-34369
2009-01-28 Constantine Plotnikovgit4idea: encoding bugfix
2009-01-20 Constantine Plotnikovgit4idea: using the file revision explicitly rather...
2009-01-13 Constantine Plotnikovgit4idea: Made merge provider to use MergeProvider2...
2008-10-17 Constantine Plotnikovgit4idea: minor code cleanup
2008-10-14 Constantine Plotnikovgit4idea: fixed collecting changes for modify-modify...