aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Engster2014-11-27 18:22:00 +0100
committerDavid Engster2014-11-27 18:22:00 +0100
commitf42adad94bd8cf4f7a86bdced796bb88ec7e5bb2 (patch)
treec7ac01d576897b14c47565e1eb4f7c5359e9cc0f /src
parent9ec7bd97faa0085694377426ca4cca8593fa3606 (diff)
downloademacs-f42adad94bd8cf4f7a86bdced796bb88ec7e5bb2.tar.gz
emacs-f42adad94bd8cf4f7a86bdced796bb88ec7e5bb2.zip
admin: Add gitmerge.el
* gitmerge.el: New file.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions