diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-02-13 23:34:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-13 23:34:58 -0800 |
| commit | 6a9b87972f27edfe53da4ce016adf4c0cd42f5e6 (patch) | |
| tree | 8bf0c7f24c13ab2cd0e401ef1b609d30486606e9 /git-merge-ours.sh | |
| parent | Merge branch 'pb/bisect' (diff) | |
| parent | s/SHELL/SHELL_PATH/ in Makefile (diff) | |
| download | tgif-6a9b87972f27edfe53da4ce016adf4c0cd42f5e6.tar.xz | |
Merge some proposed fixes
Conflicts:
Documentation/git-commit.txt - taking the post 1.2.0 semantics.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions