diff options
Diffstat (limited to 'git-merge-recursive.py')
| -rwxr-xr-x | git-merge-recursive.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index e6cbdde71a..21f1e924f0 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -1,4 +1,7 @@ #!/usr/bin/python +# +# Copyright (C) 2005 Fredrik Kuivinen +# import sys, math, random, os, re, signal, tempfile, stat, errno, traceback from heapq import heappush, heappop |