[PATCH V2] merge: let the user choose to merge, keep local or keep remote subrepo revisions

[Kevin Bullock]

On 25 Sep 2013, at 1:21 AM, Angel Ezquerra wrote:

> # HG changeset patch
> # User Angel Ezquerra <angel.ezquerra at gmail.com>
> # Date 1378420708 -7200
> #      Fri Sep 06 00:38:28 2013 +0200
> # Node ID 2fb9cb0c7b26303ac3178b7739975e663075857d
> # Parent  50d721553198cea51c30f53b76d41dc919280097
> merge: let the user choose to merge, keep local or keep remote subrepo revisions

Crewed, thanks. Let's try to find a way to test the other code paths in a follow-up.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock