diff options
| author |  Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:47 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:37 -0700 |
| commit | 41d70bd6a94d1bd1ec09d2a3d6ebd419abb25bca (patch) | |
| tree | d382753b7dc0446c3498c053a37023155396a986 /README | |
| parent | t6036: Add testcase for undetected conflict (diff) | |
| download | tgif-41d70bd6a94d1bd1ec09d2a3d6ebd419abb25bca.tar.xz | |
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>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions