- 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
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
__init__.py |
12 | 15 years ago | Rob Connolly | Caught attribute error on lazy registration in old | 446 bytes |
|
|
|
extmerge.py |
17 | 12 years ago | Mark Gius | Add config for git-mergetool style merges | 5.4 KB |
|
|
setup.py |
14 | 14 years ago | Erik Bagfors | fixed some small documentation issues | 750 bytes |
|
|