Sat, 09 Oct 2010 15:00:30 -0500 fix indentation error
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 15:00:30 -0500] rev 12665
fix indentation error
Sat, 09 Oct 2010 14:50:20 -0500 merge: handle no file parent in backwards merge (issue2364)
Matt Mackall <mpm@selenic.com> [Sat, 09 Oct 2010 14:50:20 -0500] rev 12664
merge: handle no file parent in backwards merge (issue2364)
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip