Code

checkout: use --aggressive when running a 3-way merge (-m).