tests/binfile.bin
author Matt Mackall <mpm@selenic.com>
Sat, 08 Oct 2011 14:18:18 -0500
changeset 15211 1209de02034e
parent 3368 751df21dad72
permissions -rw-r--r--
backout: deprecate/hide support for backing out merges This has never worked usefully: - it can't undo a completely unwanted merge, as it leaves the merge in the DAG - it can't undo a faulty merge as that means doing a merge correctly, not simply reverting to one or the other parent Both of these kinds of merge also require coordinated action among developers to avoid the bad merge continuing to affect future merges, so we should stop pretending that backout is of any help here. As backing out a merge now requires a hidden option, it can't be done by accident, but will continue to 'work' for anyone who's already dependent on --parent for some unknown reason.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3368
751df21dad72 Add test for git binary diff support
Brendan Cully <brendan@kublai.com>
parents: 1790
diff changeset
     1
(binary:application/octet-stream)