byplayer/egg — pull request #34 by 7max (2012-04-26 11:59:27+00:00)
Title: Please apply bugfixe for persistent hunk range for 3-way and adding symlinks

Fix errors with persistent hunk ranges when working with 3-way diffs, and adding symbolic links

* egg.el (egg-get-hunk-range): Handle 6 number hunk header range that happens in 3-way diffs
(egg-unstaged-lines-delta-before-hunk): Handle 3 number range (happens on adding symlinks)
(egg-staged-lines-delta-before-hunk): ditto