diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-05 01:13:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-10 18:27:42 -0700 |
| commit | 2ab706a38fbe6f4adb2fd09806a5d5faf33d355f (patch) | |
| tree | 5d3321a142723094aec674548fb45229199e05ae /gitMergeCommon.py | |
| parent | [PATCH] Document the trivial merge rules for 3(+more ancestors)-way merges. (diff) | |
| download | git-2ab706a38fbe6f4adb2fd09806a5d5faf33d355f.tar.gz git-2ab706a38fbe6f4adb2fd09806a5d5faf33d355f.zip | |
[PATCH] Disable debugging from read-tree.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'gitMergeCommon.py')
0 files changed, 0 insertions, 0 deletions