summaryrefslogtreecommitdiff
path: root/plugins/git4idea/src/git4idea/merge
AgeCommit message (Expand)Author
2014-07-16Snapshot idea/138.1029 from git://git.jetbrains.org/idea/community.gitTor Norbye
2014-04-17Snapshot 117b3dbedca758fa08dd37d4a36cf4a2320fae03 from idea/136.1685 of git:/...Tor Norbye
2014-04-10Snapshot 1fff8e2b7bbcfdea262d3782d4307ca6437da2a3 from idea/136.1153 of git:/...Tor Norbye
2013-11-27Snapshot e2750ea61032f2a041cb012bb7b90cffa0deba73 from idea/133.124 of git://...Tor Norbye
2013-05-06Snapshot 36a7a0702ddda30083713c9b8f140495d5f09d32 from master branch of git:/...Tor Norbye
2013-05-01Snapshot dddb119296e7ee16fa8180784610b89b89112ebb from master branch of git:/...Tor Norbye
2013-04-01Snapshot ee98b298267d0e09d2cd2f0731b6480a56dd48e7 from master branch of git:/...Jean-Baptiste Queru
2013-02-08Snapshot of commit 84dc01e773388c2c72a1fc437f313dd5747e7809Jean-Baptiste Queru
2013-01-08Snapshot of commit d5ec1d5018ed24f1b4f32b1d09df6dbd7e2fc425Jean-Baptiste Queru