Selon Ludovic Brenta <[EMAIL PROTECTED]>: > For content merges, emacs allows to use "default-A" or "default-B". If the > same was available for non-content conflicts I would be happy.
To follow up on that, I think this would involve two steps: (1) suturing the two like-named files into one, (2) resolving the ensuing content conflict as usual. In my case, the two files have the same content, but that may not be true in the general case (i.e. if there are some intervening revisions on either branch). For this resolution, I would almost always use emacs' "default-A" to choose the file contents from development branch when resolving the conflict. -- Ludovic Brenta. _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
