Michael Haggerty daccee387a try_merge_strategy(): use a statically-allocated lock_file object
Even the one lockfile object needn't be allocated each time the
function is called.  Instead, define one statically-allocated
lock_file object and reuse it for every call.

Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-10-01 13:49:01 -07:00
..
2014-07-16 11:10:11 -07:00
2014-09-19 11:38:32 -07:00
2014-09-11 10:33:32 -07:00
2014-09-09 12:54:06 -07:00
2014-09-19 11:38:35 -07:00
2014-01-17 12:21:20 -08:00
2014-07-09 11:34:05 -07:00
2014-09-26 14:39:45 -07:00
2014-09-26 14:39:43 -07:00
2014-09-26 14:39:45 -07:00
2014-09-02 13:28:44 -07:00
2014-09-26 14:39:45 -07:00
2014-09-02 12:00:30 -07:00
2014-08-13 09:50:58 -07:00
2014-09-19 11:38:35 -07:00
2014-09-11 10:33:31 -07:00
2014-04-30 10:30:02 -07:00
2014-07-16 11:25:40 -07:00
2014-09-02 12:00:30 -07:00
2014-09-11 10:33:31 -07:00