Sun, 03 Apr 2011 01:57:17 +0200 Adrian Buehlmann subrepo: process merge substate in sorted order in submerge()
Sat, 02 Apr 2011 11:07:05 +0200 Stefano Tortarolo rebase: add --tool argument for specifying merge tool
Fri, 01 Apr 2011 22:44:58 +0200 Adrian Buehlmann revert: note that added files are left as is
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip