Google Git
Sign in
apache/subversion/refs/heads/1.6.x-issue3646
commit
2487e2b3bede5687c43dd281367ab089345904f5
[log]
author
Stefan Sperling <stsp@apache.org>
Wed Sep 29 15:38:10 2010 +0000
committer
Stefan Sperling <stsp@apache.org>
Wed Sep 29 15:38:10 2010 +0000
tree
6c241ac4918f78f74ea80c80c6487dec60370fbc
parent
be4cab3cdccc413286cd4ccecd3de92434ebf4a6 [diff]
parent
aa441f5fa9efa3e1e34a1adc33d18172e6e652a9 [diff]
Sync the 1.6.x-issue3646 branch with the 1.6.x branch.

* subversion/tests/cmdline/merge_tests.py: Resolve conflicts in this file.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3646@1002684 13f79535-47bb-0310-9956-ffa450edef68
tree: 6c241ac4918f78f74ea80c80c6487dec60370fbc
  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