S's Journal

[victoria@001 ~/ddonet]$ svn update
Conflict discovered in 'data/param/Rw.csv'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options:

 (e)  edit             - change merged file in an editor
 (df) diff-full        - show all changes made to merged file
 (r)  resolved         - accept merged version of file

 (dc) display-conflict - show all conflicts (ignoring merged version)
 (mc) mine-conflict    - accept my version for all conflicts (same)
 (tc) theirs-conflict  - accept their version for all conflicts (same)

 (mf) mine-full        - accept my version of entire file (even non-conflicts)
 (tf) theirs-full      - accept their version of entire file (same)

 (p)  postpone         - mark the conflict to be resolved later
 (l)  launch           - launch external tool to resolve conflict
 (s)  show all         - show this list