diff options
| -rw-r--r-- | lisp/vc-hooks.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 709e7014262..b829b44361a 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> | 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> |
| 7 | 7 | ||
| 8 | ;; $Id: vc-hooks.el,v 1.108 1998/05/06 13:36:45 spiegel Exp rms $ | 8 | ;; $Id: vc-hooks.el,v 1.109 1998/05/07 21:34:54 rms Exp spiegel $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -338,7 +338,10 @@ similarly for other version control systems." | |||
| 338 | ((string-match "Needs Merge" status) 'needs-merge) | 338 | ((string-match "Needs Merge" status) 'needs-merge) |
| 339 | ((string-match "Needs \\(Checkout\\|Patch\\)" status) | 339 | ((string-match "Needs \\(Checkout\\|Patch\\)" status) |
| 340 | 'needs-checkout) | 340 | 'needs-checkout) |
| 341 | ((string-match "Unresolved Conflict" status) 'unresolved-conflict) | 341 | ((string-match "Unresolved Conflict" status) |
| 342 | 'unresolved-conflict) | ||
| 343 | ((string-match "File had conflicts on merge" status) | ||
| 344 | 'unresolved-conflict) | ||
| 342 | ((string-match "Locally Added" status) 'locally-added) | 345 | ((string-match "Locally Added" status) 'locally-added) |
| 343 | ((string-match "New file!" status) 'locally-added) | 346 | ((string-match "New file!" status) 'locally-added) |
| 344 | (t 'unknown)))))))))) | 347 | (t 'unknown)))))))))) |