Package:  emacs
Severity: wishlist
Tags:     patch
Control:  block -1 by 18824

>>>>> Stefan Monnier <monnier@iro.umontreal.ca> writes:

 >> Please provide a separate diff-check-labels function to allow for
 >> the code calling diff.el facilities to supply its own --label=
 >> arguments to diff in place of diff.el-generated ones.

 > Sounds fine.  While you're at it, you might like to use this for
 > smerge-mode (which uses "-L" rather than "--label").

	I assume you mean something along the lines of the (untested)
	patch MIMEd.

	Curiously, I don’t usually use the merge facility proper,
	resolving merge conflicts afterwards.  Instead, I save the diff
	against the current revision, switch to a newer one, apply the
	diff saved, and deal with the ‘.rej’ files, if any.  Like:

$ (umask 0222 && git diff > +patch-$(date +%s).diff) 
$ git reset origin/master \
      && patch -bVt -p1 -R < <(git diff) 
…
$ patch -bVt -p1 < +patch-1414405170.diff 
…

-- 
FSF associate member #7257  http://boycottsystemd.org/  … 3013 B6A0 230E 334A