Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 20:22:17 +0200] rev 4687
hgeditor: Use $HG to run 'hg diff' (see 849f011dbf79)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 20:21:10 +0200] rev 4686
Remember path to 'hg' executable and pass to external tools and hooks as $HG.
Matt Mackall <mpm@selenic.com> [Sat, 23 Jun 2007 14:02:41 -0500] rev 4685
archive: remove spurious flag_bits setting
This makes zip -T on resulting archives work. File permissions are
still retained.
Matt Mackall <mpm@selenic.com> [Sat, 23 Jun 2007 13:33:45 -0500] rev 4684
convert: sometimes git forgets the author
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 12:05:00 +0200] rev 4683
Merge with main
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 20:44:40 -0300] rev 4682
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.