Artifact
a0b5dc3272721c50c9714950f9213ff5c843e3a8:
- File
src/checkin.c
-
2016-05-30 22:25:29
— part of check-in
[d5575d14de]
on branch autosync-failure-prompt
— On a merge or update, prompt to continue of autosync fails, just like is
done for commit.
(user:
drh
size: 79234)
-
2016-05-30 22:30:46
— part of check-in
[d685096f99]
on branch trunk
— On a merge or update, prompt to continue of autosync fails, just like is done for commit.
(user:
drh
size: 79234)
-
2016-06-22 09:11:54
— part of check-in
[414fc1e95c]
on branch html-cleanup
— merge trunk
(user:
jan.nijtmans
size: 79234)
-
2016-07-04 20:13:29
— part of check-in
[003b6581ef]
on branch stash-fixes
— Merge in trunk and resolve conflict.
(user:
andybradford
size: 79234)