Code

merge-recursive: Small code clarification -- variable name and comments
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:47 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:37 +0000 (17:32 -0700)
commit41d70bd6a94d1bd1ec09d2a3d6ebd419abb25bca
treed382753b7dc0446c3498c053a37023155396a986
parentf63622c0a9665913f7ebade27910d8094ab4f9c4
merge-recursive: Small code clarification -- variable name and comments

process_renames() had a variable named "stage" and derived variables
src_other and dst_other whose purpose was not immediately obvious; also,
I want to extend the scope of this variable and use it later, so it should
have a more descriptive name.  Do so, and add a brief comment explaining
how it is used and what it relates to.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c