diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-11-30 00:24:32 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-02 17:28:19 -0800 |
| commit | 875b8ce47650d712c8f464cfedb9147673fe3ff7 (patch) | |
| tree | d4f1965a16877e8b175a2c18444f2f43ed83fc97 /git-rebase.sh | |
| parent | merge-recursive: use xdl_merge(). (diff) | |
| download | tgif-875b8ce47650d712c8f464cfedb9147673fe3ff7.tar.xz | |
xdl_merge(): fix an off-by-one bug
The line range is i1 .. (i1 + chg1 - 1), not i1 .. (i1 + chg1).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-rebase.sh')
0 files changed, 0 insertions, 0 deletions