diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-16 14:24:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-16 14:24:56 -0700 |
| commit | 5bc4ce589646faf72c7a77a5d32d9496ccc8d456 (patch) | |
| tree | ccd388a1e05223b96675d51d37a1f2db9df5ee94 /git-merge-ours.sh | |
| parent | 402461aab17292b78bd36a17bff18e48d544cc9a (diff) | |
| download | git-5bc4ce589646faf72c7a77a5d32d9496ccc8d456.tar.gz | |
reading $GIT_DIR/info/graft - skip comments correctly.
Noticed by Yann Dirson.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions