On Mon, Mar 26, 2012 at 10:21 AM, Konstantin Khomoutov
<flatw...@users.sourceforge.net> wrote:
>
> Just out of curiosity: does anyone know a VCS which handles merges
> in some other way?

It's hard to imagine how it would handle merge conflicts without a
staging area of some kind.

-- 
Gé
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to