![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:37:33 +0000 (16:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:37:33 +0000 (16:37 -0700) | ||
| commit | 90e8b9b23dff20946a0eacdf8abedce7e32c1d78 | |
| tree | 013a475f89cb949c7b448620c9efc009af17b59e | tree | snapshot |
| parent | 81f90684bf879f4e149a2aeb277daf1c38fab16e | commit | diff |
| parent | 75973b2cb58bf2b3038c5c214fc0a1b96d6868fe | commit | diff |
Merge branch 'jc/fix-add-u-unmerged' into maint
* jc/fix-add-u-unmerged:
Fix "add -u" that sometimes fails to resolve unmerged paths
Conflicts:
builtin/add.c
* jc/fix-add-u-unmerged:
Fix "add -u" that sometimes fails to resolve unmerged paths
Conflicts:
builtin/add.c
| builtin/add.c | diff1 | | diff2 | | blob | history |
| t/t2200-add-update.sh | diff1 | | diff2 | | blob | history |