summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2014-10-01 12:28:20 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-01 13:45:13 -0700
commit4f4713df94e2f3d3adbd39b8fce571e2bd69185e (patch)
tree0d01a95bd0f52871359d0fc03a43be0466554a96 /ll-merge.c
parentremove_lock_file(): call rollback_lock_file() (diff)
downloadtgif-4f4713df94e2f3d3adbd39b8fce571e2bd69185e.tar.xz
commit_lock_file(): inline temporary variable
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions