The proposal is also on the website (not sure if the previous link is publicly readable):
http://darcs.net/GSoC/2015-Conflicts-Handling-and-UI _______________________________________________ darcs-users mailing list darcs-users@darcs.net http://lists.osuosl.org/mailman/listinfo/darcs-users
