[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> If an "hg update" is attempted across branches, it is aborted with an error message, basically saying that "update -m" is required. Don't prompt the user for "keep vs delete" kinds of questions before deciding to abort. manifest hash: 250d3a0e866af2feac9344d499b26c254c33abc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNeDywK+sNU5EO8RAu2BAJwNWXXN2L+4TnOUGaOe9iBj6CgOYgCfRKIE RF5czx2UQ2pSIP119xzq9mQ= =Akj6 -----END PGP SIGNATURE-----

     1

checking changesets

     2

checking manifests

     3

crosschecking files in changesets and manifests

     4

checking files

     5

1 files, 1 changesets, 1 total revisions

     6

requesting all changes

     7

adding changesets

     8

adding manifests

     9

adding file revisions

    10

modified 1 files, added 1 changesets and 1 new revisions

    11

checking changesets

    12

checking manifests

    13

crosschecking files in changesets and manifests

    14

checking files

    15

1 files, 1 changesets, 1 total revisions

    16

foo

    17

2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo

    18

killed!