git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 577b2ff) | patch

author	Glenn Morris <rgm@gnu.org>
	Sun, 23 Mar 2014 17:56:34 +0000 (10:56 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Sun, 23 Mar 2014 17:56:34 +0000 (10:56 -0700)
commit	74b1f21db316d3c9c07df2796afd11de87ea8bb2
tree	c3e7bed0cbeab662b14d31b21358b3e651a235f0	tree \| snapshot
parent	577b2ffd2d787506261ed758b086fb4257116dba	commit \| diff

Fix up recent merge ChangeLog duplication

Perhaps the merge was done without using bzrmerge.el

lisp/ChangeLog		diff \| blob \| history
test/ChangeLog		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.