diff options
| author | Jon Loeliger <jdl@freescale.com> | 2005-11-06 10:26:07 -0600 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-06 10:31:48 -0800 |
| commit | bb73d73c0885fce357e0d70aa51c2215a8e38a4e (patch) | |
| tree | fef586ef93089ddb1088c003cb84cafa8ba3c81b /git-sh-setup.sh | |
| parent | 3402f1d6a3d8f4205fe59286e3a1223a9d28aea6 (diff) | |
| download | git-bb73d73c0885fce357e0d70aa51c2215a8e38a4e.tar.gz | |
Refactor merge strategies into separate includable file.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions