~edwin-grubbs/+junk/canonical-vim

Viewing all changes in revision 44.

  • Committer: Edwin Grubbs
  • Date: 2010-07-26 13:53:33 UTC
  • Revision ID: edwin.grubbs@canonical.com-20100726135333-6r8tr3uel39p4abh
Added file detection for .THIS and .OTHER files that bzr creates when merges have conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: