diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2011-05-26 02:12:14 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-26 02:12:14 -0500 |
| commit | c19d653c4fcdc93169507c09f8f66ebffbdbb9a5 (patch) | |
| tree | a35ddef2950330a0ac88f0c467080ea32e751831 /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | Merge branch 'db/vcs-svn-incremental' into svn-fe (diff) | |
| parent | vcs-svn: drop obj_pool (diff) | |
| download | tgif-c19d653c4fcdc93169507c09f8f66ebffbdbb9a5.tar.xz | |
Merge branch 'db/svn-fe-code-purge' into svn-fe
* db/svn-fe-code-purge:
vcs-svn: drop obj_pool
vcs-svn: drop treap
vcs-svn: drop string_pool
vcs-svn: pass paths through to fast-import
Conflicts:
vcs-svn/fast_export.c
vcs-svn/fast_export.h
vcs-svn/repo_tree.c
vcs-svn/repo_tree.h
vcs-svn/string_pool.c
vcs-svn/svndump.c
vcs-svn/trp.txt
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions