Google Git
Sign in
gerrit/gerrit/b07ef1db3ebf750707ff63722cd7ef0a3a0e1ec1
commit
b07ef1db3ebf750707ff63722cd7ef0a3a0e1ec1
[log]
author
David Pursehouse <david.pursehouse@sonymobile.com>
Thu Oct 15 04:01:27 2015 +0000
committer
Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu Oct 15 04:01:27 2015 +0000
tree
2bf7d5b77a4aeb560e5441e787770cc5dcdb3f44
parent
945c23c0892c375413100cdaaf26cd8dfe8799f3 [diff]
parent
250bab05a83fd6c6f2ab83329a8ef77f5b50d608 [diff]
Merge changes from topic 'conflicts-with-merge' into stable-2.11

* changes:
  Fix "Conflicts With" when current change is a merge commit
  Fix "Conflicts With" when other change is a merge-commit
tree: 2bf7d5b77a4aeb560e5441e787770cc5dcdb3f44
  1. .settings/
  2. bucklets/
  3. contrib/
  4. Documentation/
  5. gerrit-acceptance-tests/
  6. gerrit-antlr/
  7. gerrit-cache-h2/
  8. gerrit-common/
  9. gerrit-extension-api/
  10. gerrit-gwtdebug/
  11. gerrit-gwtexpui/
  12. gerrit-gwtui/
  13. gerrit-gwtui-common/
  14. gerrit-httpd/
  15. gerrit-launcher/
  16. gerrit-lucene/
  17. gerrit-main/
  18. gerrit-oauth/
  19. gerrit-openid/
  20. gerrit-patch-commonsnet/
  21. gerrit-patch-jgit/
  22. gerrit-pgm/
  23. gerrit-plugin-api/
  24. gerrit-plugin-archetype/
  25. gerrit-plugin-gwt-archetype/
  26. gerrit-plugin-gwtui/
  27. gerrit-plugin-js-archetype/
  28. gerrit-prettify/
  29. gerrit-reviewdb/
  30. gerrit-server/
  31. gerrit-solr/
  32. gerrit-sshd/
  33. gerrit-util-cli/
  34. gerrit-util-http/
  35. gerrit-util-ssl/
  36. gerrit-war/
  37. lib/
  38. plugins/
  39. ReleaseNotes/
  40. tools/
  41. website/
  42. .buckconfig
  43. .buckversion
  44. .gitignore
  45. .gitmodules
  46. .mailmap
  47. .pydevproject
  48. .watchmanconfig
  49. BUCK
  50. COPYING
  51. INSTALL
  52. SUBMITTING_PATCHES
  53. VERSION