]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1ed8ff2) | patch
* admin/gitmerge.el (gitmerge-resolve):
authorGlenn Morris <rgm@gnu.org>
Sat, 2 Dec 2017 03:00:02 +0000 (22:00 -0500)
committerGlenn Morris <rgm@gnu.org>
Sat, 2 Dec 2017 03:00:02 +0000 (22:00 -0500)
commit52097314c1a160be622dfcf9f40c33190a90be88
treef93b1bb526169ea5f360b0914c57b7aca9f38686tree | snapshot
parent1ed8ff2aa9e1aaee54a6cad38f4c9a595d6c19edcommit | diff
* admin/gitmerge.el (gitmerge-resolve):
Fix treatment of generated files.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.