summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-10-30 12:10:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-30 12:10:27 -0700
commit414b7033b16f23b724ea81d71c4b74ef42edad17 (patch)
tree31ad340d06db608b6420cf71495b96984e5acada /resolve-undo.c
parentMerge branch 'hn/log-graph-color-octopus' (diff)
parentgc: remove gc.pid file at end of execution (diff)
downloadtgif-414b7033b16f23b724ea81d71c4b74ef42edad17.tar.xz
Merge branch 'nd/gc-lock-against-each-other'
* nd/gc-lock-against-each-other: gc: remove gc.pid file at end of execution
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions