Differences From Artifact [01985ecbf8]:

• File src/merge.c — part of check-in [070ce24d83] at 2010-12-15 01:49:39 on branch trunk — Report the number of conflicts at the end of a merge or update and offer a hint to the user about the "fossil undo" command. (user: drh size: 14511)

To Artifact [e2954e0bf8]:

• File src/merge.c — part of check-in [30981b64a4] at 2010-12-18 14:18:41 on branch trunk — Simplifications to the implementation of undo/redo. Add the --explain option to undo/redo that shows what would be undone or redone without actually doing anything. (user: drh size: 14542)

71
72
73
74
75
76
77

78
79
80
81
82
83
84

  /* Notation:
  **
  **      V     The current checkout
  **      M     The version being merged in
  **      P     The "pivot" - the most recent common ancestor of V and M.
  */


  detailFlag = find_option("detail",0,0)!=0;
  pickFlag = find_option("cherrypick",0,0)!=0;
  backoutFlag = find_option("backout",0,0)!=0;
  debugFlag = find_option("debug",0,0)!=0;
  zBinGlob = find_option("binary",0,1);
  nochangeFlag = find_option("nochange","n",0)!=0;
  if( g.argc!=3 ){

>

71
72
73
74
75
76
77
78
79
80
81
82
83
84
85

  /* Notation:
  **
  **      V     The current checkout
  **      M     The version being merged in
  **      P     The "pivot" - the most recent common ancestor of V and M.
  */

  undo_capture_command_line();
  detailFlag = find_option("detail",0,0)!=0;
  pickFlag = find_option("cherrypick",0,0)!=0;
  backoutFlag = find_option("backout",0,0)!=0;
  debugFlag = find_option("debug",0,0)!=0;
  zBinGlob = find_option("binary",0,1);
  nochangeFlag = find_option("nochange","n",0)!=0;
  if( g.argc!=3 ){