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 /src | |
| 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 'src')
0 files changed, 0 insertions, 0 deletions