diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-13 23:10:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 23:10:50 -0800 |
| commit | 4f8b8992ef0c009822cdca18d32ddf3a124ee284 (patch) | |
| tree | d6688aedd217cdd9f46962af57432265e9b5ccff /Documentation/git-merge-file.txt | |
| parent | Merge branch 'kk/maint-http-push' into maint (diff) | |
| parent | fast-import: Cleanup mode setting. (diff) | |
| download | tgif-4f8b8992ef0c009822cdca18d32ddf3a124ee284.tar.xz | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
fast-import: Cleanup mode setting.
Git.pm: call Error::Simple() properly
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions