diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-02-02 15:17:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-02 17:53:26 -0800 |
| commit | 46dc941246af6e845eb7835afdb8cd20eed835b7 (patch) | |
| tree | 2b022b9b34b375afff456e7527a3d89a56ce8abf /git-merge.sh | |
| parent | combine-diff: show parent line numbers as well. (diff) | |
| download | tgif-46dc941246af6e845eb7835afdb8cd20eed835b7.tar.xz | |
combine-diff: cleanup.
The flag on the surviving lines meant "this parent is not
different" while the parent_map flag on the lost lines meant
"this parent is different", which was confusing. So swap the
meaning of on-bit in the flag. Also more heavily comment the
code.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions