summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-12-01 12:26:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-01 12:26:45 -0800
commit4a2775974ae47b69768b6bf5c5c75539409bb289 (patch)
tree2b63d98779d136bbcefed8b666e5228bea6a5c30 /builtin-merge.c
parentMerge branch 'jn/gitweb-blame' (diff)
parentget_ref_states: strdup entries and free util in stale list (diff)
downloadtgif-4a2775974ae47b69768b6bf5c5c75539409bb289.tar.xz
Merge branch 'bw/remote-get-ref-states-fix'
* bw/remote-get-ref-states-fix: get_ref_states: strdup entries and free util in stale list
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions