![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Jul 2009 23:57:47 +0000 (16:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 18 Jul 2009 23:57:47 +0000 (16:57 -0700) |
* maint:
checkout -f: deal with a D/F conflict entry correctly
sha1_name.c: avoid unnecessary strbuf_release
refs.c: release file descriptor on error return
checkout -f: deal with a D/F conflict entry correctly
sha1_name.c: avoid unnecessary strbuf_release
refs.c: release file descriptor on error return
| 1 | 2 | |||
|---|---|---|---|---|
| refs.c | patch | | diff1 | | diff2 | | blob | history |
| unpack-trees.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc refs.c
Simple merge
diff --cc unpack-trees.c
Simple merge