diff options
| author | Eric S. Raymond | 2014-08-13 04:05:45 -0400 |
|---|---|---|
| committer | Eric S. Raymond | 2014-08-13 04:05:45 -0400 |
| commit | 2cc441ecbf093d2d7e319f2359b80fd358589b0f (patch) | |
| tree | b12c3085c43277ebb92f5e92ee91d110527335e0 /src/buffer.h | |
| parent | c1677234a35ac49ac1dd4276a19e90ac8e62b6e6 (diff) | |
| download | emacs-2cc441ecbf093d2d7e319f2359b80fd358589b0f.tar.gz emacs-2cc441ecbf093d2d7e319f2359b80fd358589b0f.zip | |
Integrate Rüdiger Sonderfeld's code for detecting conflicted files under git.
Diffstat (limited to 'src/buffer.h')
0 files changed, 0 insertions, 0 deletions