diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-05-02 11:27:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-02 11:27:31 -0700 |
| commit | 6644d2f2c490f8a7081bd7e5da12c19400c8b6ef (patch) | |
| tree | 890dc4da460811b56e00189f5a12de7ea26d4603 /Documentation/merge-strategies.txt | |
| parent | Don't use seq in tests, not everyone has it (diff) | |
| parent | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint (diff) | |
| download | tgif-6644d2f2c490f8a7081bd7e5da12c19400c8b6ef.tar.xz | |
Merge branch 'maint'
* maint:
cvsserver: Handle re-added files correctly
Fix compilation of test-delta
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions