Viewing all changes in revision 1303.
- Committer: Gordon Tyler
- Date: 2010-10-03 13:54:40 UTC
- Revision ID: gordon@doxxx.net-20101003135440-lh4cwxw7ja0txy3a
Replaced extmerge editbox with dropdown list containing merge tools.
- files modified:
- lib/conflicts.py
expand all
collapse all
added
removed
