op public repos

Commits

Commit:: fc6346c42a66d7fc562608e08dbd41e775facfc4
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 11:51:30 2019 UTC

don't leave file as unversioned in case of wt edit vs repo rm

diff | patch | tree

Commit:: 13d9040b96f5ba9ac50c137a9909f824dd5bde20
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 11:33:41 2019 UTC

test and improve behaviour for wt edit vs repo rm conflict

diff | patch | tree

Commit:: 085d5bcf0b7635235aeaa2608540072bdc88ae99
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 11:03:38 2019 UTC

use a better naming scheme for tree conflict tests

diff | patch | tree

Commit:: 708d8e672e598275721ee0e9707e5bea2b0435b4
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 11:00:59 2019 UTC

fix behaviour when update deletes an edited file

diff | patch | tree

Commit:: e9b3576faf75d4564e5ed585837da4482e6a9c26
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 09:07:20 2019 UTC

document when tog(1) uses split-screen views

diff | patch | tree

Commit:: 9419758ad1a4c8ffc59729ca82fb4e73a3a803df
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 09:04:17 2019 UTC

markup fix in tog(1) man page

diff | patch | tree

Commit:: 95adcdcaec7617831087917a2967c0cc475860bc
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 08:47:18 2019 UTC

add some diff tests

diff | patch | tree

Commit:: 7154f6ce0618e7d8582cd42d577f01cbc3c18d16
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 08:22:15 2019 UTC

make 'got status' detect and indicate merge conflict markers

diff | patch | tree

Commit:: 01a44956166c76e44f58809e5a1ea1477adfef80
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 07:36:44 2019 UTC

declare conflict marker strings in got_lib_diff.h

diff | patch | tree

Commit:: 3165301c5af64176c55b5c4c7dbfab343106e3e9
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 07:23:30 2019 UTC

test conflict resolution in test_update_conflict_add_vs_add

diff | patch | tree

Commit:: 1430b4e093e8dcc1a214e26991cd06d3992db829
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 07:18:28 2019 UTC

treat 'add vs add' on update as a text conflict for now

diff | patch | tree

Commit:: a7c182ac81f43ee290d92ff16781ea0b908c33c3
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 06:55:04 2019 UTC

missing error return in test_double_add

diff | patch | tree

Commit:: 71a293558dcac7d17b10ae63f911aaf3f5b30df2
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 06:48:54 2019 UTC

fix behaviour when 'got rm' is used twice

diff | patch | tree

Commit:: 5c99ca9fe447187c440a413772fb14201f30a1d2
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Mar 27 06:41:37 2019 UTC

fix behaviour when 'got add' is used twice

diff | patch | tree

Commit:: 4dfb2f0f5fc9cda1a29a92fc304c67d15e269014
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Mar 26 13:16:11 2019 UTC

mention bare repos in git-repository(5), not got(1)

diff | patch | tree