Mercurial > emacs
comparison leim/quail/latin-pre.el @ 82007:c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 20 Jul 2007 20:41:58 +0000 |
| parents | f5f322eb227f |
| children | 43baea8f514b 95d0cdf160ea |
comparison
equal
deleted
inserted
replaced
| 82006:5942689a5d21 | 82007:c934794f2e69 |
|---|