diff options
| author | Eric S. Raymond | 2014-08-13 04:42:33 -0400 |
|---|---|---|
| committer | Eric S. Raymond | 2014-08-13 04:42:33 -0400 |
| commit | b5354531bac4ea261d66804ac81be222fdeaaec2 (patch) | |
| tree | 3cfdc1df487cd269f46abaa80596ae794e460cd3 /src/coding.h | |
| parent | 2cc441ecbf093d2d7e319f2359b80fd358589b0f (diff) | |
| download | emacs-b5354531bac4ea261d66804ac81be222fdeaaec2.tar.gz emacs-b5354531bac4ea261d66804ac81be222fdeaaec2.zip | |
Add smerge support to the git back end.
Diffstat (limited to 'src/coding.h')
0 files changed, 0 insertions, 0 deletions