diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-20 18:29:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 18:29:19 (GMT) |
| commit | 96203bb074544a37fcff9c3f2a68582b76caa263 (patch) | |
| tree | c94d11799e9665230fc1bdf462fc6142590ce948 /builtin/merge-file.c | |
| parent | 6a01298a7ed2c18cd68358127304024575b27cc0 (diff) | |
| parent | 8fe5d87622a4268079bf1e5738474f85d4e5c3bc (diff) | |
| download | git-96203bb074544a37fcff9c3f2a68582b76caa263.zip git-96203bb074544a37fcff9c3f2a68582b76caa263.tar.gz git-96203bb074544a37fcff9c3f2a68582b76caa263.tar.bz2 | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.0.3
fetch: Fix minor memory leak
fetch: Future-proof initialization of a refspec on stack
fetch: Check for a "^{}" suffix with suffixcmp()
daemon: parse_host_and_port SIGSEGV if port is specified
Makefile: Fix CDPATH problem
pull: replace unnecessary sed invocation
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions