| commit | 1e89864f92b3e1f29592ae914cf6fccce40d49d2 | |
| author | Glenn Morris <rgm@gnu.org> | |
| Tue, 19 Dec 2017 00:38:25 +0000 (18 19:38 -0500) | ||
| committer | Glenn Morris <rgm@gnu.org> | |
| Tue, 19 Dec 2017 00:38:25 +0000 (18 19:38 -0500) | ||
| tree | b00bfa77972997ce4dc862d38ef0c56f6c9f5b37 | treesnapshot (tar.gz zip) |
| parent | 91031a2cfd6b6a3b17c0f8724fd5cccf7c32ed5b | commitdiff |
Make gitmerge usable in batch mode
* admin/gitmerge.el (gitmerge-missing): Add progress messages.
(gitmerge-maybe-resume): In batch mode, never resume.
(gitmerge): Handle batch mode.
* admin/gitmerge.el (gitmerge-missing): Add progress messages.
(gitmerge-maybe-resume): In batch mode, never resume.
(gitmerge): Handle batch mode.
| admin/gitmerge.el | diffblobblamehistory |