Differences From Artifact [2ce5d09517]:

• File src/undo.c — part of check-in [f41308d780] at 2012-10-25 13:59:42 on branch trunk — Allow the deletion of multiple stash entries using "fossil stash rm" with multiple arguments. Multi-stash deletion is undoable. (user: drh size: 13003)

To Artifact [0562747017]:

• File src/undo.c — part of check-in [cd2c0e4cb5] at 2012-11-05 21:10:16 on branch trunk — Do not run the graphical merging tool nor leave merge-droppings after a dry-run merge. Also improve the merge summary message at the end of a merge. (user: drh size: 13004) [more...]

320
321
322
323
324
325
326
327
328
329
330
331
332
333
334

/*
** Complete the undo process is one is currently in process.
*/
void undo_finish(void){
  if( undoActive ){
    if( undoNeedRollback ){
      fossil_print("\"fossil undo\" is available to undo changes"
             " to the working checkout.\n");
    }
    undoActive = 0;
    undoNeedRollback = 0;
  }
}

|

320
321
322
323
324
325
326
327
328
329
330
331
332
333
334

/*
** Complete the undo process is one is currently in process.
*/
void undo_finish(void){
  if( undoActive ){
    if( undoNeedRollback ){
      fossil_print(" \"fossil undo\" is available to undo changes"
             " to the working checkout.\n");
    }
    undoActive = 0;
    undoNeedRollback = 0;
  }
}