aa-mergeprof cmdline changes, disable 3-way-merge for now
This is the rebased version of the patch by Kshitij Gupta <email@example.com> (mostly) original patch description: Changes to facilitate 2-way merge (maybe also 3-way) of multiple profiles as discussed on IRC This patch - moves reset method to reset_aa function - modifies message displayed to user - allows processing of multiple files in 2-way merge - disables 3-way merge till new syntax has been decided The changes reflect the approach of providing arbitrary number of files using wildcards or explicitly. The changes map the profiles in the given files to their respective files in the local directory specified using -d. Then the merges take place profile-wise. Acked-by: Steve Beattie <firstname.lastname@example.org>.
Showing with 519 additions and 455 deletions