![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 18:01:15 +0000 (11:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 18:01:15 +0000 (11:01 -0700) | ||
| commit | f7d59e256884f63adeed9a1f3376a386a28681ff | |
| tree | d79d33ee5fa727db52c2bcba4c5e66841538d102 | tree | snapshot |
| parent | 3e1a363b1ff748237f3a6e4f3e2803445f09c54c | commit | diff |
| parent | 75973b2cb58bf2b3038c5c214fc0a1b96d6868fe | commit | diff |
Merge branch 'jc/fix-add-u-unmerged'
* jc/fix-add-u-unmerged:
Fix "add -u" that sometimes fails to resolve unmerged paths
* jc/fix-add-u-unmerged:
Fix "add -u" that sometimes fails to resolve unmerged paths
| builtin/add.c | diff1 | | diff2 | | blob | history |
| t/t2200-add-update.sh | diff1 | | diff2 | | blob | history |