diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:37:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:37:33 -0700 |
| commit | 90e8b9b23dff20946a0eacdf8abedce7e32c1d78 (patch) | |
| tree | 013a475f89cb949c7b448620c9efc009af17b59e /exec_cmd.c | |
| parent | 81f90684bf879f4e149a2aeb277daf1c38fab16e (diff) | |
| parent | 75973b2cb58bf2b3038c5c214fc0a1b96d6868fe (diff) | |
| download | git-90e8b9b23dff20946a0eacdf8abedce7e32c1d78.tar.gz | |
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
Diffstat (limited to 'exec_cmd.c')
0 files changed, 0 insertions, 0 deletions