diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-21 04:28:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 04:28:49 (GMT) |
| commit | 5fc9df08b564aa9d11265ad591f9ef104695ce2b (patch) | |
| tree | a6f6a12aaf7547a2e54621bb3a475fed1082c7b7 /Documentation/git-merge.txt | |
| parent | 9ca8f834116fab64e31e368e97001c75fd3c1b05 (diff) | |
| parent | a8b59ef578df2b06a89fecd46f3d379895e77e8f (diff) | |
| download | git-5fc9df08b564aa9d11265ad591f9ef104695ce2b.zip git-5fc9df08b564aa9d11265ad591f9ef104695ce2b.tar.gz git-5fc9df08b564aa9d11265ad591f9ef104695ce2b.tar.bz2 | |
Merge branch 'jh/notes' (early part)
* 'jh/notes' (early part):
Add more testcases to test fast-import of notes
Rename t9301 to t9350, to make room for more fast-import tests
fast-import: Proper notes tree manipulation
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions