Google Git
Sign in
apache / subversion / 5b3b16cd3a682e75668a4a4a46ccde87f5ace34a
commit5b3b16cd3a682e75668a4a4a46ccde87f5ace34a[log] [tgz]
authorPaul Burba <pburba@apache.org>Mon Jul 14 16:55:22 2008 +0000
committerPaul Burba <pburba@apache.org>Mon Jul 14 16:55:22 2008 +0000
tree00ee927a0d88361765eba43e4d94743cd59fb0c6
parentd1a9dbdcc3038a85c7a36fe843609f9ccc748f0f [diff]
On the src-branch-3157 backport branch, merge r31398 from trunk.

* subversion/tests/cmdline/merge_tests.py
  Manually resolve merge trivial merge conflict resulting from the fact
  that other merge tests haven't been backported yet. 

* src-branch-3157, COMMITTERS, subversion/bindings/swig:
  Mergeinfo updates.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.5.x-issue3157@872168 13f79535-47bb-0310-9956-ffa450edef68
1 file changed
tree: 00ee927a0d88361765eba43e4d94743cd59fb0c6
  1. build/
  2. contrib/
  3. doc/
  4. notes/
  5. packages/
  6. subversion/
  7. tools/
  8. www/
  9. aclocal.m4
  10. autogen.sh
  11. BUGS
  12. build.conf
  13. CHANGES
  14. COMMITTERS
  15. configure.ac
  16. COPYING
  17. gen-make.py
  18. HACKING
  19. INSTALL
  20. Makefile.in
  21. README
  22. STATUS
  23. TRANSLATING
  24. win-tests.py