diff options
| author | Stefan Monnier | 2007-07-20 20:41:58 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-07-20 20:41:58 +0000 |
| commit | 74dea9e1c1ca344e0542cfbd751707641d69375e (patch) | |
| tree | 73b7324475f4999526e05b1fb786fb33a10713ac /src | |
| parent | bb042dc6fab52bd691b520b03ee61be7718664c0 (diff) | |
| download | emacs-74dea9e1c1ca344e0542cfbd751707641d69375e.tar.gz emacs-74dea9e1c1ca344e0542cfbd751707641d69375e.zip | |
(change-log-resolve-conflict): Don't lose data if the merge fails.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions