Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Jun 2009 13:58:48 +0200] rev 8834
merge: rename -S/--show option to -P/--preview
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Jun 2009 13:58:22 +0200] rev 8833
mq: unify code for qdel -r and qfin
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 19 Jun 2009 12:37:29 +0200] rev 8832
mq: warn about finalizing patches without cset message
Matt Mackall <mpm@selenic.com> [Thu, 18 Jun 2009 16:56:03 -0500] rev 8831
filemerge: add internal:dump
This create foo.{local,other,base} files for people to manually merge
files while littering their working directory.
Matt Mackall <mpm@selenic.com> [Thu, 18 Jun 2009 16:56:02 -0500] rev 8830
filemerge: add internal:prompt target
Frank Kingswood <frank@kingswood-consulting.co.uk> [Thu, 18 Jun 2009 10:39:04 +0100] rev 8829
convert: Make P4 conversion cope with keywords, binary files and symbolic links.
Convert now handles errors from p4 during conversion more gracefully.
If keyword expansion is enabled in a P4 file then keywords will be
unexpanded in hg.
Added testcase for p4 filetypes and keyword (un)expansion.
This testcase ignores UTF and Apple files to avoid binary data.
Edited by pmezard: fixed collation issue on OSX
Chia-Huan Wu <willie.tw@gmail.com> [Thu, 18 Jun 2009 21:13:56 +0200] rev 8828
i18n-zh_TW: Traditional Chinese translation
Martin Geisler <mg@lazybytes.net> [Thu, 18 Jun 2009 15:04:20 +0200] rev 8827
patchbomb: update test output to match 2aff285b902f