| commit | 8d7b43947d4482731e6256d3e903bc9fec624e6b | |
| author | glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a> | |
| Wed, 9 Apr 2008 17:58:29 +0000 (9 17:58 +0000) | ||
| committer | glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a> | |
| Wed, 9 Apr 2008 17:58:29 +0000 (9 17:58 +0000) | ||
| tree | 2bd321792805e902741b9a967e8366556b5d15e1 | treesnapshot (tar.gz zip) |
| parent | 9197b64c0b36058b84727f3835efa416195284bc | commitdiff |
* subversion/libsvn_client/merge.c
(WHICH SVN_CLIENT_MERGE* API DO I WANT?): Clarify: svn_client_merge
writes mergeinfo, it just doesn't use it to decide what to merge.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30459 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
(WHICH SVN_CLIENT_MERGE* API DO I WANT?): Clarify: svn_client_merge
writes mergeinfo, it just doesn't use it to decide what to merge.
git-svn-id: http://svn.collab.net/repos/svn/trunk@30459 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
| subversion/libsvn_client/merge.c | diffblobblamehistory |