aboutsummaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorAdam Spiers <git@adamspiers.org>2012-12-27 02:32:22 +0000
committerJunio C Hamano <gitster@pobox.com>2012-12-28 12:07:45 -0800
commit840fc334e98e89e28039f85c3eff0caab5f20eb3 (patch)
tree58f2514f164bfd04a5470b985b06a26e8ce2f418 /merge-file.c
parent95a68344afcaf229765921c70458ee76add342dc (diff)
downloadgit-840fc334e98e89e28039f85c3eff0caab5f20eb3.tar.gz
git-840fc334e98e89e28039f85c3eff0caab5f20eb3.tar.xz
dir.c: rename cryptic 'which' variable to more consistent name
'el' is only *slightly* less cryptic, but is already used as the variable name for a struct exclude_list pointer in numerous other places, so this reduces the number of cryptic variable names in use by one :-) Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions