]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 597ede7) | patch
Small improvement for noninteractive gitmerge
authorGlenn Morris <rgm@gnu.org>
Mon, 15 Jan 2018 20:43:16 +0000 (12:43 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 15 Jan 2018 20:43:16 +0000 (12:43 -0800)
commit7d6a6b4a4c701b7900809e6209de42f2dc14e1e3
tree2b19b78e188c21758a6202ebb555c73b913636catree | snapshot
parent597ede7e5b3c965f1653d15c964e86ccb989a62fcommit | diff
Small improvement for noninteractive gitmerge

* admin/gitmerge.el (gitmerge-resolve-unmerged):
In batch mode, report conflicted files.
admin/gitmerge.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.