diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-19 15:41:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-19 15:41:55 -0700 |
| commit | b8950769b8b91d634ec549fd1af792ccc1864f79 (patch) | |
| tree | 9c1f18332894c18f404932ad11be32d401fbe5eb /diff-files.c | |
| parent | ba580aeafb52921025de1efe1c50db34393f9907 (diff) | |
| parent | 61c2bcbd11e3b66a328b3850c01592e5dc1c67bb (diff) | |
| download | git-b8950769b8b91d634ec549fd1af792ccc1864f79.tar.gz | |
Merge branch 'maint'
* maint:
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
Diffstat (limited to 'diff-files.c')
0 files changed, 0 insertions, 0 deletions