aboutsummaryrefslogtreecommitdiffstats
path: root/src/scroll.c
diff options
context:
space:
mode:
authorStefan Monnier2008-03-31 01:49:57 +0000
committerStefan Monnier2008-03-31 01:49:57 +0000
commit2fa42bb70b23267d01347d1c471dc8a71e2c7026 (patch)
tree37b971dc4704bb5c5c189f68ab27f920503979b4 /src/scroll.c
parent34ee3257bd6220b1635a66c7010293ff25e3cd4a (diff)
downloademacs-2fa42bb70b23267d01347d1c471dc8a71e2c7026.tar.gz
emacs-2fa42bb70b23267d01347d1c471dc8a71e2c7026.zip
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
Diffstat (limited to 'src/scroll.c')
0 files changed, 0 insertions, 0 deletions