summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2021-01-31 17:38:38 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2021-01-31 17:38:38 -0500
commit11abc4aef42ceaea451c264e5a7292e765d4f31b (patch)
treef08a48e93e5d1b5ef773bc66f8178b0795e98cac /admin/gitmerge.el
parentcb72b8345b4c6741650c4cff8844716386acaf23 (diff)
parentd2341eb0fb8139f92955c1462ee7b965befdccee (diff)
downloademacs-11abc4aef42ceaea451c264e5a7292e765d4f31b.tar.gz
Merge remote-tracking branch 'origin/scratch/lexical-gnus' into trunk
Diffstat (limited to 'admin/gitmerge.el')
0 files changed, 0 insertions, 0 deletions