diff options
| author | Stefan Monnier | 2008-04-11 01:10:43 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-04-11 01:10:43 +0000 |
| commit | 0e05d8fc47f4744f85c46aef451d3b2fa7e315a0 (patch) | |
| tree | 5d7b0864834050ba1085ee3ef52074a74002afba /src | |
| parent | e89b536d4b54f200b2f9a6f4561d4b634ef4bbe0 (diff) | |
| download | emacs-0e05d8fc47f4744f85c46aef451d3b2fa7e315a0.tar.gz emacs-0e05d8fc47f4744f85c46aef451d3b2fa7e315a0.zip | |
(smerge-apply-resolution-patch): Fix typo.
(smerge-resolve): Merge the "2-way refinement" case with one half of
the "mere whitespace" resolution.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions