builtin-am: implement --resolved/--continue