<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/libgit2.git/tests/merge, branch cmn/https-cap-no-hardcode</title>
<subtitle>github.com: libgit2/libgit2.git
</subtitle>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/'/>
<entry>
<title>git_diff_generated: abstract generated diffs</title>
<updated>2016-05-26T18:01:08+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-04-19T19:12:18+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=9be638ecf0d64ec98b3fd16f2d983a86d1aca131'/>
<id>9be638ecf0d64ec98b3fd16f2d983a86d1aca131</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>merge drivers: handle configured but not found driver</title>
<updated>2016-03-17T15:06:00+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-02-29T02:30:00+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=d953c4505e09756b4b4f72b431a51867281643ca'/>
<id>d953c4505e09756b4b4f72b431a51867281643ca</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>merge driver: remove `check` callback</title>
<updated>2016-03-17T15:06:00+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-02-28T14:34:11+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=6d8b2cdbee00f2c4e97796b52e05dd39bd655138'/>
<id>6d8b2cdbee00f2c4e97796b52e05dd39bd655138</id>
<content type='text'>
Since the `apply` callback can defer, the `check` callback is not
necessary.  Removing the `check` callback further makes the `payload`
unnecessary along with the `cleanup` callback.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Since the `apply` callback can defer, the `check` callback is not
necessary.  Removing the `check` callback further makes the `payload`
unnecessary along with the `cleanup` callback.
</pre>
</div>
</content>
</entry>
<entry>
<title>merge driver: tests for set and unset merge attribute</title>
<updated>2016-03-17T15:02:27+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-12-26T19:47:17+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=58d33126d44eeff69e375e500d1e77e03e2665a0'/>
<id>58d33126d44eeff69e375e500d1e77e03e2665a0</id>
<content type='text'>
Ensure that setting the merge attribute forces the built-in default
`text` driver and does *not* honor the `merge.default` configuration
option.  Further ensure that unsetting the merge attribute forces
a conflict (the `binary` driver).
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Ensure that setting the merge attribute forces the built-in default
`text` driver and does *not* honor the `merge.default` configuration
option.  Further ensure that unsetting the merge attribute forces
a conflict (the `binary` driver).
</pre>
</div>
</content>
</entry>
<entry>
<title>merge driver: tests for custom default merge drivers</title>
<updated>2016-03-17T15:02:27+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-12-25T06:34:39+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=d3f0875a60c4112f004c21aa0e02db7af9e79597'/>
<id>d3f0875a60c4112f004c21aa0e02db7af9e79597</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>merge driver: test GIT_EMERGECONFLICT</title>
<updated>2016-03-17T15:02:27+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-12-24T05:52:02+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=7d307c1edc5430dce270302d539d6eab8ed054c7'/>
<id>7d307c1edc5430dce270302d539d6eab8ed054c7</id>
<content type='text'>
When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT`
stop and product a conflict.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT`
stop and product a conflict.
</pre>
</div>
</content>
</entry>
<entry>
<title>merge driver: test GIT_PASSTHROUGH</title>
<updated>2016-03-17T15:02:27+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-12-24T05:44:58+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=59f293146503bf5e615161fe89c305f080755dd1'/>
<id>59f293146503bf5e615161fe89c305f080755dd1</id>
<content type='text'>
When a `check` or `apply` callback function returns `GIT_PASSTHROUGH`,
move on to the default merge driver.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When a `check` or `apply` callback function returns `GIT_PASSTHROUGH`,
move on to the default merge driver.
</pre>
</div>
</content>
</entry>
<entry>
<title>merge driver: introduce custom merge drivers</title>
<updated>2016-03-17T15:02:26+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-12-23T16:23:08+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=3f04219fcdcbc6369270eaf2d878d4fe7064254d'/>
<id>3f04219fcdcbc6369270eaf2d878d4fe7064254d</id>
<content type='text'>
Consumers can now register custom merged drivers with
`git_merge_driver_register`.  This allows consumers to support the
merge drivers, as configured in `.gitattributes`.  Consumers will be
asked to perform the file-level merge when a custom driver is
configured.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Consumers can now register custom merged drivers with
`git_merge_driver_register`.  This allows consumers to support the
merge drivers, as configured in `.gitattributes`.  Consumers will be
asked to perform the file-level merge when a custom driver is
configured.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix rebase bug and include test for merge=union</title>
<updated>2016-03-17T15:02:26+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2015-12-03T17:57:56+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=7a74590d8f952971088a90c584945ceefe1bf90e'/>
<id>7a74590d8f952971088a90c584945ceefe1bf90e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>merge::workdir::dirty: update to use `st_ctime_nsec`</title>
<updated>2016-03-07T14:37:51+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-03-07T14:37:51+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/libgit2.git/commit/?id=6abdf52d6eba71908f4389b14f9b7b3f1827f8c7'/>
<id>6abdf52d6eba71908f4389b14f9b7b3f1827f8c7</id>
<content type='text'>
Update unit test to use newfangled `st_ctime_nsec`, which provides
indirection to the platform-correct name.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Update unit test to use newfangled `st_ctime_nsec`, which provides
indirection to the platform-correct name.
</pre>
</div>
</content>
</entry>
</feed>
