| commit | d5c1493791cad75d488d6364687c3b35e4299fb9 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 12 May 2008 18:21:24 +0000 (12 18:21 +0000) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 12 May 2008 18:21:24 +0000 (12 18:21 +0000) | ||
| tree | 39c40b44646d9b5f0c206111be8c3051fa6a6227 | treesnapshot (tar.gz zip) |
| parent | 84cb74cf070bd76a81e81f597165d67875fe79a7 | commitdiff |
(smerge-apply-resolution-patch): Don't pass nil to `insert'.
| lisp/ChangeLog | diffblobblamehistory | |
| lisp/smerge-mode.el | diffblobblamehistory |