Bug 25771

Summary: Let mergemaster not display diffs
Product: Base System Reporter: k <k>
Component: binAssignee: Doug Barton <dougb>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Unspecified   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description k 2001-03-13 13:30:01 UTC 
	Sometimes I do not want to have to read all the diff
	when running mergemaster but still be able to choose to
	see some diffs.

	I have added an option to mergemaster do disable the
	default view of diff and still allow the user to view
	the diff for the specific files he/she want to see.

	Maybe another letter should be choosed for this option
	but -V is the most natural to me :-)
Comment 1 Johan Karlsson freebsd_committer freebsd_triage 2001-03-13 13:30:46 UTC 
Responsible Changed
From-To: freebsd-bugs->dougb

Over to mergemaster maintainer.
Comment 2 Doug Barton freebsd_committer freebsd_triage 2001-03-24 07:28:01 UTC 
State Changed
From-To: open->closed


If you don't want to look at the diffs, there are already  
hooks in the script to let you either automatically install 
or automatically delete those files. As much as I appreciate 
your suggestion, this is a bit too much creeping featurism.