diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-09 06:41:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-09 06:47:23 (GMT) |
| commit | 796b13781aecce551b8f92049a66646e60f31dce (patch) | |
| tree | faa8f227f6ba5a02bb6d4668ebe5f83b04c43c54 /xdiff-interface.c | |
| parent | 6da14ee14f85fe5766780e1cbe8d42d385638e9e (diff) | |
| parent | db12d97542762cdb54d332ea047122f1071132b5 (diff) | |
| download | git-796b13781aecce551b8f92049a66646e60f31dce.zip git-796b13781aecce551b8f92049a66646e60f31dce.tar.gz git-796b13781aecce551b8f92049a66646e60f31dce.tar.bz2 | |
Merge branch 'maint'
* maint:
Start 1.6.2.3 preparation
process_{tree,blob}: Remove useless xstrdup calls
git-pull.sh: better warning message for "git pull" on detached head.
Conflicts:
RelNotes
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions