diff options
| author | Elijah Newren <newren@gmail.com> | 2010-09-20 02:28:48 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:32:37 -0700 |
| commit | 09c01f856f65ffdde9a61708a5d74a372d68807a (patch) | |
| tree | 3b69a7e007f003be05aad5ed905ae16b55c35639 /object.h | |
| parent | 41d70bd6a94d1bd1ec09d2a3d6ebd419abb25bca (diff) | |
| download | git-09c01f856f65ffdde9a61708a5d74a372d68807a.tar.gz git-09c01f856f65ffdde9a61708a5d74a372d68807a.tar.xz | |
merge-recursive: Rename conflict_rename_rename*() for clarity
The names conflict_rename_rename and conflict_rename_rename_2 did not make
it clear what they were handling. Since the first of these handles one
file being renamed in both branches to different files, while the latter
handles two different files being renamed to the same thing, add a little
'1to2' and '2to1' suffix on these and an explanatory comment to make their
intent clearer.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object.h')
0 files changed, 0 insertions, 0 deletions