| commit | f0b5d4dd2a3ad665a5bbaedf84bfb7c240831da4 | |
| author | Catalin Marinas <catalin.marinas@gmail.com> | |
| Thu, 21 Jun 2007 22:04:49 +0000 (21 23:04 +0100) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Thu, 21 Jun 2007 22:04:49 +0000 (21 23:04 +0100) | ||
| tree | 6abf23c9c948846a23a7c5190b90c13c0d258244 | treesnapshot (tar.gz zip) |
| parent | 48eaeebe87521ef92000d03d3d3408913ae31c53 | commitdiff |
Pass a string rather than an exception object in gitmergeonefile
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
| stgit/gitmergeonefile.py | diffblobblamehistory |