diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-09-19 00:03:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-20 18:16:27 -0700 |
| commit | 63f1aa6c72c46928f1b6959437aed4becbc42ff3 (patch) | |
| tree | dcea0f1c834747eb6756b35fbe43e9bb5c6b3f1d /unpack-file.c | |
| parent | Use git-merge instead of git-resolve in git-pull. (diff) | |
| download | tgif-63f1aa6c72c46928f1b6959437aed4becbc42ff3.tar.xz | |
Make Octopus merge message a bit nicer.
Linus says that 'of .' to mean the commits came from the local repository
was too confusing and ugly -- I tend to agree with him.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'unpack-file.c')
0 files changed, 0 insertions, 0 deletions