diff options
| author | Paul Eggert | 2016-03-22 15:46:30 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-03-22 15:46:49 -0700 |
| commit | 4fab26ba5ac381ce836eff521fc56d8d28570221 (patch) | |
| tree | efc15605a581c527b7490c5fc62dd19a31dc44ce /admin | |
| parent | b08237185ec044c8afff0feb88a126512b33a6d8 (diff) | |
| download | emacs-4fab26ba5ac381ce836eff521fc56d8d28570221.tar.gz emacs-4fab26ba5ac381ce836eff521fc56d8d28570221.zip | |
* admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge".
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/gitmerge.el b/admin/gitmerge.el index a07f57a6008..74e6f80487b 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | (defvar gitmerge-skip-regexp | 50 | (defvar gitmerge-skip-regexp |
| 51 | ;; We used to include "sync" in there, but in my experience it only | 51 | ;; We used to include "sync" in there, but in my experience it only |
| 52 | ;; caused false positives. --Stef | 52 | ;; caused false positives. --Stef |
| 53 | "back[- ]?port\\|do not merge\\|re-?generate\\|bump version\\|from trunk\\|\ | 53 | "back[- ]?port\\|\\(do not\\|no need to\\) merge\\|re-?generate\\|bump version\\|from trunk\\|\ |
| 54 | Auto-commit" | 54 | Auto-commit" |
| 55 | "Regexp matching logs of revisions that might be skipped. | 55 | "Regexp matching logs of revisions that might be skipped. |
| 56 | `gitmerge-missing' will ask you if it should skip any matches.") | 56 | `gitmerge-missing' will ask you if it should skip any matches.") |