summaryrefslogtreecommitdiff
path: root/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java
AgeCommit message (Expand)Author
2014-03-10Merge remote-tracking branch 'aosp/snapshot-master' into mergeTor Norbye
2014-03-06Merge idea133 into masterTor Norbye
2013-08-21Snapshot 5755a4daa62e3fe56827696be38afb29f7fa297b from master branch of git:/...Tor Norbye
2013-08-07Snapshot af729d01433bb5bbd6ca93c0fdf9778b36d624ce from master branch of git:/...Tor Norbye
2013-04-01Snapshot ee98b298267d0e09d2cd2f0731b6480a56dd48e7 from master branch of git:/...Jean-Baptiste Queru
2013-02-27Snapshot of commit 329607d9ebcedf2bb0ad81265354366db7dc3f9cJean-Baptiste Queru
2013-02-08Snapshot of commit 84dc01e773388c2c72a1fc437f313dd5747e7809Jean-Baptiste Queru