martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
79f15092b9d16631840cd42db034b787fae762ac
emacs/admin/gitmerge.el
Glenn Morris 7d6a6b4a4c Small improvement for noninteractive gitmerge 
* admin/gitmerge.el (gitmerge-resolve-unmerged):
In batch mode, report conflicted files.
2018-01-15 12:43:16 -08:00

23 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink