~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_textmerge.py

• browse files at revision 5124
• compare with another revision
• download diff
• download tarball
• view history from revision 5124

• reverse the comparison (5124 to 1732.1.7)
• stop comparing with revision 1732.1.7

Show diffs side-by-side

added

removed

bzrlib/tests/test_textmerge.py

12

12

#

13

13

# You should have received a copy of the GNU General Public License

14

14

# along with this program; if not, write to the Free Software

15

 

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 

15

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

16

16

#

17

17

# Author: Aaron Bentley <aaron.bentley@utoronto.ca>

18

18

from bzrlib.textmerge import Merge2

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1