~markgius/bzr-extmerge/git-mergetool-support

Viewing all changes in revision 17.

  • Committer: Mark Gius
  • Date: 2011-06-03 17:56:30 UTC
  • Revision ID: launchpad@markgius.com-20110603175630-5r95vggesx5ealqy
Add config for git-mergetool style merges

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: