[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

requesting all changes

     2

adding changesets

     3

abort: error 111: Connection refused

     4

transaction abort!

     5

rollback completed

     6

checking changesets

     7

checking manifests

     8

crosschecking files in changesets and manifests

     9

checking files

    10

0 files, 0 changesets, 0 total revisions

    11

cat: foo: No such file or directory

    12

requesting all changes

    13

adding changesets

    14

abort: HTTP Error 404: File not found

    15

transaction abort!

    16

rollback completed

    17

checking changesets

    18

checking manifests

    19

crosschecking files in changesets and manifests

    20

checking files

    21

0 files, 0 changesets, 0 total revisions

    22

cat: foo: No such file or directory