]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 653a81b) | patch
* admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.
authorGlenn Morris <rgm@gnu.org>
Wed, 29 Jul 2020 22:15:15 +0000 (15:15 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 29 Jul 2020 22:15:15 +0000 (15:15 -0700)
commit55806ee46b047c03698340ce8a6397de6355c56a
tree1b7a8d72934bf7ba5ad4b74bd173684f67511243tree | snapshot
parent653a81bf8ce41725d12b20f6de3d1877d190f269commit | diff
* admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.