Merge branch 'nd/gc-lock-against-each-other'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:27 +0000 (12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:27 +0000 (12:10 -0700)
* nd/gc-lock-against-each-other:
gc: remove gc.pid file at end of execution

1  2 
builtin/gc.c
diff --cc builtin/gc.c
Simple merge