diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-20 23:48:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 23:48:46 -0700 |
| commit | 3ba4f3a9fc68ba4c5a0064107e8993c5fc5b684f (patch) | |
| tree | ae4db4348f007b3603534d720690869bc5c4b3e0 /builtin-merge-file.c | |
| parent | http.c: fix compiling with libcurl 7.9.2 (diff) | |
| parent | Merge branch 'maint-1.6.1' into maint-1.6.2 (diff) | |
| download | tgif-3ba4f3a9fc68ba4c5a0064107e8993c5fc5b684f.tar.xz | |
Merge branch 'maint-1.6.2' into maint
* maint-1.6.2:
git-show-ref.txt: remove word and make consistent
git-svn documentation: fix typo in 'rebase vs. pull/merge' section
use xstrdup, not strdup in ll-merge.c
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions