diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-10-23 00:36:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-27 17:16:40 -0700 |
| commit | 9926ba98a4a77e012ea9121abee42608fe1564b6 (patch) | |
| tree | bcb37631fc65f96f7e095ded96860411909f17d8 /git-merge-one-file.sh | |
| parent | merge: loosen overcautious "working file will be lost" check. (diff) | |
| download | tgif-9926ba98a4a77e012ea9121abee42608fe1564b6.tar.xz | |
merge-recursive: use abbreviated commit object name.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions