diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-29 23:11:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-29 23:11:03 -0700 |
| commit | 8e4f767ba77051aedaac7ef6639ee990778866c7 (patch) | |
| tree | 3883ab313ee3ba979cd8893684f243dd8b997c82 /Documentation/git-merge-file.txt | |
| parent | test-lib: Clean up comments and Makefile. (diff) | |
| parent | import-zips: fix thinko (diff) | |
| download | tgif-8e4f767ba77051aedaac7ef6639ee990778866c7.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
import-zips: fix thinko
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions