#
#
# patch "NEWS"
#  from [c2114e3597f77fa5e2408fc16c4ad313afba60cd]
#    to [c5f2ce448b323e3213d4d7adf43fb3299d9071a4]
# 
# patch "cmd_diff_log.cc"
#  from [3c9f19d67f371b379ccc7cae24cddd0e0d9e7de0]
#    to [baea6a3047420da7d1cff17f2669f973e0643e56]
# 
# patch "tests/command_completion/__driver__.lua"
#  from [99783bc246436c70cd35e25536511b2233c97c6c]
#    to [f9866a1c0279d56b0811f47ed0fdb77640c106d7]
#
============================================================
--- NEWS	c2114e3597f77fa5e2408fc16c4ad313afba60cd
+++ NEWS	c5f2ce448b323e3213d4d7adf43fb3299d9071a4
@@ -1,9 +1,11 @@
 ??? ??? ?? ??:??:?? UTC 2008
 
         0.39 release.
 
         Changes
 
+        - 'mtn di' is now an alias for 'mtn diff'.
+
         - 'automate db_set' has been renamed to 'automate set_db_variable'.
 
         - 'automate db_get' has been replaced by 'automate get_db_variables'
============================================================
--- cmd_diff_log.cc	3c9f19d67f371b379ccc7cae24cddd0e0d9e7de0
+++ cmd_diff_log.cc	baea6a3047420da7d1cff17f2669f973e0643e56
@@ -478,7 +478,7 @@ prepare_diff(cset & included,
     revheader = header.str();
 }
 
-CMD(diff, "diff", "", CMD_REF(informative), N_("[PATH]..."),
+CMD(diff, "diff", "di", CMD_REF(informative), N_("[PATH]..."),
     N_("Shows current differences"),
     N_("Compares the current tree with the files in the repository and "
        "prints the differences on the standard output.\n"
============================================================
--- tests/command_completion/__driver__.lua	99783bc246436c70cd35e25536511b2233c97c6c
+++ tests/command_completion/__driver__.lua	f9866a1c0279d56b0811f47ed0fdb77640c106d7
@@ -9,7 +9,8 @@ check(mtn("dif"), 0, false, false)
 -- Completion of a command.
 check(mtn("diff"), 0, false, false)
 check(mtn("dif"), 0, false, false)
-check(mtn("di"), 1, false, false)
+check(mtn("di"), 0, false, false)
+check(mtn("d"), 1, false, false)
 
 -- Completion of a subcommand at the second level.
 check(mtn("list", "key"), 0, false, false)