Google Git
Sign in
gerrit/gerrit/2f79f56ea2852e92e46cee151ba7c39e84b9992c
commit
2f79f56ea2852e92e46cee151ba7c39e84b9992c
[log]
author
Dave Borowitz <dborowitz@google.com>
Mon Jan 26 14:15:58 2015 -0800
committer
Dave Borowitz <dborowitz@google.com>
Wed Jan 28 10:17:34 2015 -0800
tree
bb760ec330927197a3f9e263eb4acf97b726a11b
parent
5b4c65e0ab4f0663a13ae919c0e636d52833e1bf [diff]
Clean up MergeException

Change-Id: I961e5a11cb9f75fbc4905da5c6f956ec968cde2d
1 file changed
tree: bb760ec330927197a3f9e263eb4acf97b726a11b
  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-openid/
  19. gerrit-patch-commonsnet/
  20. gerrit-patch-jgit/
  21. gerrit-pgm/
  22. gerrit-plugin-api/
  23. gerrit-plugin-archetype/
  24. gerrit-plugin-gwt-archetype/
  25. gerrit-plugin-gwtui/
  26. gerrit-plugin-js-archetype/
  27. gerrit-prettify/
  28. gerrit-reviewdb/
  29. gerrit-server/
  30. gerrit-solr/
  31. gerrit-sshd/
  32. gerrit-util-cli/
  33. gerrit-util-http/
  34. gerrit-util-ssl/
  35. gerrit-war/
  36. lib/
  37. plugins/
  38. ReleaseNotes/
  39. tools/
  40. website/
  41. .buckconfig
  42. .buckversion
  43. .gitignore
  44. .gitmodules
  45. .mailmap
  46. .pydevproject
  47. .watchmanconfig
  48. BUCK
  49. COPYING
  50. INSTALL
  51. SUBMITTING_PATCHES
  52. VERSION