diff options
| author | Allan Caffee <allan.caffee@gmail.com> | 2009-04-22 17:27:59 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-22 17:49:56 -0700 |
| commit | a6c1a3827c934872726bafb35f51f2ad9b9e897f (patch) | |
| tree | 3a0f601dcec66d00cbacfc1848b42ca75ad0c4be /git-difftool.perl | |
| parent | 36a31feae23ac45a130fa38b2934a74e4e7156b4 (diff) | |
| download | git-a6c1a3827c934872726bafb35f51f2ad9b9e897f.tar.gz git-a6c1a3827c934872726bafb35f51f2ad9b9e897f.tar.xz | |
graph API: fix a bug in the rendering of octopus merges
An off by one error was causing octopus merges with 3 parents to not be
rendered correctly. This regression was introduced by 427fc5.
Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions