log .zfun/_hg @ 135:de6d0a9a7e3f

age author description
Fri, 20 Feb 2009 14:21:41 -0600 Augie Fackler basic completions for hg merge
Fri, 20 Feb 2009 14:21:27 -0600 Augie Fackler Fix up the number of spaces required so really long branch names don't screw up the completion.