Andrew's git / gitweb.git / diff
?
Merge branch 'rs/plug-strbuf-leak-in-merge'
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 19:38:32 +0000 (11:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 19:38:37 +0000 (11:38 -0800)
* rs/plug-strbuf-leak-in-merge:
merge: release strbuf after use in suggest_conflicts()

1  2 
builtin/merge.c patch | diff1 | diff2 | blob | history
diff --cc builtin/merge.c
Simple merge