merge with crew-stable
authorThomas Arendsen Hein <thomas@intevation.de>
Wed, 20 Aug 2008 15:05:43 +0200
changeset 6919 7d1713353aaf
parent 6917 b6fffcd97242 (current diff)
parent 6918 c8555b127408 (diff)
child 6921 2cb708e25a5d
merge with crew-stable
--- a/tests/test-qrecord.out	Wed Aug 20 11:09:53 2008 +0200
+++ b/tests/test-qrecord.out	Wed Aug 20 15:05:43 2008 +0200
@@ -33,14 +33,14 @@
 
  -e --edit         edit commit message
  -g --git          use git extended diff format
+ -U --currentuser  add "From: <current user>" to patch
+ -u --user         add "From: <given user>" to patch
+ -D --currentdate  add "Date: <current date>" to patch
+ -d --date         add "Date: <given date>" to patch
  -I --include      include names matching the given patterns
  -X --exclude      exclude names matching the given patterns
  -m --message      use <text> as commit message
  -l --logfile      read commit message from <file>
- -U --currentuser  add "From: <current user>" to patch
- -u --user         add "From: <given user>" to patch
- -D --currentdate  add "Date: <current date>" to patch
- -d --date         add "Date: <given date>" to patch
 
 use "hg -v help qrecord" to show global options
 % base commit