Mercurial > emacs
view vpath.sed @ 78572:5b92bb6e6570
(smerge-resolve): New arg `safe'.
(smerge-resolve-all, smerge-batch-resolve): New function.
(smerge-refine): Make sure `diff' returns the expected result.
(smerge-parsep-re): New const.
(smerge-mode): Use it to adjust paragraph-separate.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 16 Aug 2007 20:04:36 +0000 |
parents | 695cf19ef79e |
children | 375f2633d815 |
line wrap: on
line source
/^VPATH *=/c\ # This works only in GNU make. Using the patterns avoids\ # object files being found by VPATH, and thus permits building\ # when $srcdir is configured itself.\ vpath %.c $(srcdir)\ vpath %.h $(srcdir)\ \ # arch-tag: 56a64b50-e4e8-443a-960f-f13af0f1a545