~doxxx/bzr/mergetools-commands

Viewing all changes in revision 5422.

  • Committer: Gordon Tyler
  • Date: 2011-02-25 04:51:38 UTC
  • Revision ID: gordon@doxxx.net-20110225045138-71yf8rl98de1w8ro
resolve_conflicts returns 0 or first non-zero retval from mergetool.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: