| commit | 02dfeba8a4ce93dadd7f5fa7f462fca12fdf28f8 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Wed, 13 Feb 2008 15:10:57 +0000 (13 15:10 +0000) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Wed, 13 Feb 2008 15:10:57 +0000 (13 15:10 +0000) | ||
| tree | 6f3af2c8cce69d443906f83ed834d82ec34b4a2f | treesnapshot (tar.gz zip) |
| parent | 78dc87a23feb2a1a5d5dc0c2a5abc3a310493dcf | commitdiff |
(smerge-auto-combine-max-separation): New var.
(smerge-auto-combine): New fun.
(smerge-auto-combine): New fun.