Google Git
Sign in
chromium / chromium / tools / depot_tools.git / 4dd093752e4b6bf761f30b317a0131021c997627
commit4dd093752e4b6bf761f30b317a0131021c997627[log] [tgz]
author[email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98>Fri Jul 22 14:41:51 2011
committer[email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98>Fri Jul 22 14:41:51 2011
treef610449b9cff4dca39e6d3f5c464101ebd7e11fd
parent2aad1b262d01c5075738d53afb1cf203a1b2c475 [diff]
Add merge attribute to OptionsObject in gclient_scm_test.py.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7488015

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@93628 0039d316-1c4b-4281-b951-d872f2087c98
1 file changed
tree: f610449b9cff4dca39e6d3f5c464101ebd7e11fd
  1. bootstrap/
  2. git_cl/
  3. tests/
  4. third_party/
  5. zsh-goodies/
  6. .gitignore
  7. apply_issue.py
  8. breakpad.py
  9. checkout.py
  10. chrome-update-create-task.bat
  11. chrome-update.bat
  12. chrome-update.py
  13. chromite
  14. codereview.settings
  15. commit_queue.py
  16. cpplint.bat
  17. cpplint.py
  18. create-chromium-git-src
  19. drover
  20. drover.bat
  21. drover.py
  22. fix_encoding.py
  23. gcl
  24. gcl.bat
  25. gcl.py
  26. gclient
  27. gclient.bat
  28. gclient.py
  29. gclient_scm.py
  30. gclient_utils.py
  31. git-cl
  32. git-cl-upload-hook
  33. git-gs
  34. git-try
  35. git_cl.py
  36. git_try.py
  37. hammer
  38. hammer.bat
  39. LICENSE
  40. OWNERS
  41. owners.py
  42. patch.py
  43. PRESUBMIT.py
  44. presubmit_canned_checks.py
  45. presubmit_support.py
  46. profile.xml
  47. pylintrc
  48. README
  49. README.codereview
  50. README.gclient
  51. README.git-cl
  52. README.testing
  53. repo
  54. rietveld.py
  55. scm.py
  56. subprocess2.py
  57. trychange.py
  58. update_depot_tools
  59. WATCHLISTS
  60. watchlists.py
  61. weekly
  62. wtf