Files
git/builtin
Michael Haggerty 1fef4b5041 try_merge_strategy(): remove redundant lock_file allocation
By the time the "if" block is entered, the lock_file instance from the
main function block is no longer in use, so re-use that one instead of
allocating a second one.

Note that the "lock" variable in the "if" block shadowed the "lock"
variable at function scope, so the only change needed is to remove the
inner definition.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-10-01 13:49:00 -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-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