diff options
| author | Glenn Morris | 2012-12-04 20:49:31 -0500 |
|---|---|---|
| committer | Glenn Morris | 2012-12-04 20:49:31 -0500 |
| commit | 49596095d09227d828ffb6fed955ba0b660b4d92 (patch) | |
| tree | c3d733d7d5f1288711c59dabbadfa59e43decd48 /lisp/ChangeLog | |
| parent | f2484dffa2bb96d245839eeae94153cf70209d42 (diff) | |
| download | emacs-49596095d09227d828ffb6fed955ba0b660b4d92.tar.gz emacs-49596095d09227d828ffb6fed955ba0b660b4d92.zip | |
Add conflict detection/resolution to vc-hg (bug#10709)
* lisp/vc/vc-hg.el (vc-hg-resolve-when-done, vc-hg-find-file-hook):
New functions, for detecting and resolving conflicts.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ff9b0e2a86f..45fa38042a0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * vc/vc-hg.el (vc-hg-resolve-when-done, vc-hg-find-file-hook): | ||
| 4 | New functions, for detecting and resolving conflicts. (Bug#10709) | ||
| 5 | |||
| 1 | 2012-12-04 Jambunathan K <kjambunathan@gmail.com> | 6 | 2012-12-04 Jambunathan K <kjambunathan@gmail.com> |
| 2 | 7 | ||
| 3 | * hi-lock.el (hi-lock-auto-select-face): New user variable. | 8 | * hi-lock.el (hi-lock-auto-select-face): New user variable. |