pager: add attend-<command> option This lets users override attend settings locally on a command granularity.

pager: variable reorder

pager: break auto out of command check loop

pager: break always out of command check loop

pager: break pager invocation out of command check loop

tests: fix test failure on vfat It can't handle filenames with spaces. We don't have a good hghave test for this, so we wrap it with unix-permissions.

largefiles: include largefiles when doing log on a directory (issue4241) The matchers _files had to include both the real root and the standin version of the root.

journal: set Abort hint when failing due to an abandoned transaction

merge: define conflict marker labels in filemerge() Moves the conflict marker definition up to filemerge, so it gets applied to all merge strategies, and so in a future patch we can manipulate the markers.

merge: prevent simplemerge from mutating label list simplemerge was using list.pop() to remove items from the labels list. This mutated the list and made it unusable by other calls (for instance, it might be used in both the premerge and actual merge stages).