status.c
6.18 KB
-
Merge remote-tracking branch 'arrbee/tree-walk-fixes' into development · 51e1d808Conflicts: src/notes.c src/transports/git.c src/transports/http.c src/transports/local.c tests-clar/odb/foreach.c
Vicent Marti committed
Conflicts: src/notes.c src/transports/git.c src/transports/http.c src/transports/local.c tests-clar/odb/foreach.c