]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82a8ad2 6fdd750)
Merge branch 'feature/standard-test-location'
authorPhillip Lord <phillip.lord@russet.org.uk>
Thu, 26 Nov 2015 21:11:29 +0000 (21:11 +0000)
committerPhillip Lord <phillip.lord@russet.org.uk>
Thu, 26 Nov 2015 21:11:29 +0000 (21:11 +0000)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
test/lisp/autorevert-tests.el patch | diff1 | diff2 | blob | history
test/lisp/filenotify-tests.el patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc test/lisp/autorevert-tests.el
Simple merge
diff --cc test/lisp/filenotify-tests.el
Simple merge