<!DOCTYPE html>
<html lang='en'>
<head>
<title>DateTimeField.java « ui « vaadin « com « java « main « src « server - vaadin-framework.git - Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework</title>
<meta name='generator' content='cgit v1.2.3'/>
<meta name='robots' content='index, nofollow'/>
<link rel='stylesheet' type='text/css' href='/cgit.css'/>
<link rel='shortcut icon' href='/favicon.ico'/>
<link rel='alternate' title='Atom feed' href='https://source.dussan.org/vaadin-framework.git/atom/server/src/main/java/com/vaadin/ui/DateTimeField.java?h=master' type='application/atom+xml'/>
</head>
<body>
<div id='cgit'><table id='header'>
<tr>
<td class='logo' rowspan='2'><a href='/'><img src='/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/'>index</a> : <a href='/vaadin-framework.git/'>vaadin-framework.git</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='f71f751852ca8136af68853058d835def87db429'/><select name='h' onchange='this.form.submit();'>
<option value='7.0'>7.0</option>
<option value='7.1'>7.1</option>
<option value='7.2'>7.2</option>
<option value='7.3'>7.3</option>
<option value='7.4'>7.4</option>
<option value='7.5'>7.5</option>
<option value='7.6'>7.6</option>
<option value='7.7'>7.7</option>
<option value='7.7.45-changelog'>7.7.45-changelog</option>
<option value='8.0'>8.0</option>
<option value='8.1'>8.1</option>
<option value='8.10'>8.10</option>
<option value='8.11'>8.11</option>
<option value='8.12'>8.12</option>
<option value='8.13'>8.13</option>
<option value='8.14'>8.14</option>
<option value='8.2'>8.2</option>
<option value='8.3'>8.3</option>
<option value='8.4'>8.4</option>
<option value='8.5'>8.5</option>
<option value='8.6'>8.6</option>
<option value='8.7'>8.7</option>
<option value='8.8'>8.8</option>
<option value='8.9'>8.9</option>
<option value='JS-RPC-docs-link-syntax'>JS-RPC-docs-link-syntax</option>
<option value='OlliTietavainenVaadin-patch-1'>OlliTietavainenVaadin-patch-1</option>
<option value='OlliTietavainenVaadin-patch-2'>OlliTietavainenVaadin-patch-2</option>
<option value='add-deprecation-warning-20241105'>add-deprecation-warning-20241105</option>
<option value='changelog-7.7.47-changes'>changelog-7.7.47-changes</option>
<option value='changelog-8.27.1'>changelog-8.27.1</option>
<option value='changelog-8.27.2'>changelog-8.27.2</option>
<option value='changelog-8.27.3'>changelog-8.27.3</option>
<option value='changelog-8.27.4'>changelog-8.27.4</option>
<option value='changelog-8.27.6'>changelog-8.27.6</option>
<option value='changelog-8.28.1'>changelog-8.28.1</option>
<option value='chore-mention-8.14.4'>chore-mention-8.14.4</option>
<option value='chore-readme-8-14-4'>chore-readme-8-14-4</option>
<option value='context-menu'>context-menu</option>
<option value='datefield-set-invalid-value'>datefield-set-invalid-value</option>
<option value='declarative'>declarative</option>
<option value='dependabot/maven/org.eclipse.jetty-jetty-server-10.0.14'>dependabot/maven/org.eclipse.jetty-jetty-server-10.0.14</option>
<option value='dependabot/maven/org.eclipse.jetty-jetty-webapp-9.4.44.v20210927'>dependabot/maven/org.eclipse.jetty-jetty-webapp-9.4.44.v20210927</option>
<option value='dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-3.5.3.201412180710-r'>dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-3.5.3.201412180710-r</option>
<option value='dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-7.2.1.202505142326-r'>dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-7.2.1.202505142326-r</option>
<option value='dependabot/maven/org.hsqldb-hsqldb-2.7.1'>dependabot/maven/org.hsqldb-hsqldb-2.7.1</option>
<option value='documentation'>documentation</option>
<option value='documentation-7.6'>documentation-7.6</option>
<option value='downgrade-snapshot-version-20241105'>downgrade-snapshot-version-20241105</option>
<option value='exclude-element-screenshot'>exclude-element-screenshot</option>
<option value='feature/atmosphere-pure-javascript'>feature/atmosphere-pure-javascript</option>
<option value='feature/bootstrap-annotation'>feature/bootstrap-annotation</option>
<option value='feature/combobox-communication'>feature/combobox-communication</option>
<option value='feature/dalvik'>feature/dalvik</option>
<option value='feature/databinding'>feature/databinding</option>
<option value='feature/dnd'>feature/dnd</option>
<option value='feature/elements'>feature/elements</option>
<option value='feature/eventbus'>feature/eventbus</option>
<option value='feature/karaf-feature-file'>feature/karaf-feature-file</option>
<option value='feature/nullrepresentation'>feature/nullrepresentation</option>
<option value='feature/standard-gwt'>feature/standard-gwt</option>
<option value='feature/standard-sass'>feature/standard-sass</option>
<option value='feature/vaadin8'>feature/vaadin8</option>
<option value='feature/vaadin8-book'>feature/vaadin8-book</option>
<option value='feature/vaadin8-book-vol2'>feature/vaadin8-book-vol2</option>
<option value='feature/vaadin8-sass-valo-only'>feature/vaadin8-sass-valo-only</option>
<option value='fileToFilesReplacement'>fileToFilesReplacement</option>
<option value='fix11576'>fix11576</option>
<option value='fix_event_router_prototype'>fix_event_router_prototype</option>
<option value='grid'>grid</option>
<option value='grid_dnd_autoscroller'>grid_dnd_autoscroller</option>
<option value='grid_dragger'>grid_dragger</option>
<option value='issue/8307_select_using_collection'>issue/8307_select_using_collection</option>
<option value='master' selected='selected'>master</option>
<option value='mobile_drag_image_offset'>mobile_drag_image_offset</option>
<option value='pr/11306'>pr/11306</option>
<option value='remote-run/flow-atmosphere-test'>remote-run/flow-atmosphere-test</option>
<option value='snapshot/7.5'>snapshot/7.5</option>
<option value='snapshot/7.6'>snapshot/7.6</option>
<option value='tmattsso-patch-1'>tmattsso-patch-1</option>
<option value='update-minor-deps'>update-minor-deps</option>
<option value='vaadin-icons-3.0.1'>vaadin-icons-3.0.1</option>
<option value='wip-date-time-datatype'>wip-date-time-datatype</option>
<option value='wip-java-10-compat'>wip-java-10-compat</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework</td><td class='sub right'>www-data</td></tr></table>
<table class='tabs'><tr><td>
<a href='/vaadin-framework.git/about/'>about</a><a href='/vaadin-framework.git/'>summary</a><a href='/vaadin-framework.git/refs/?id=f71f751852ca8136af68853058d835def87db429'>refs</a><a href='/vaadin-framework.git/log/server/src/main/java/com/vaadin/ui/DateTimeField.java'>log</a><a class='active' href='/vaadin-framework.git/tree/server/src/main/java/com/vaadin/ui/DateTimeField.java?id=f71f751852ca8136af68853058d835def87db429'>tree</a><a href='/vaadin-framework.git/commit/server/src/main/java/com/vaadin/ui/DateTimeField.java?id=f71f751852ca8136af68853058d835def87db429'>commit</a><a href='/vaadin-framework.git/diff/server/src/main/java/com/vaadin/ui/DateTimeField.java?id=f71f751852ca8136af68853058d835def87db429'>diff</a><a href='/vaadin-framework.git/stats/server/src/main/java/com/vaadin/ui/DateTimeField.java'>stats</a></td><td class='form'><form class='right' method='get' action='/vaadin-framework.git/log/server/src/main/java/com/vaadin/ui/DateTimeField.java'>
<input type='hidden' name='id' value='f71f751852ca8136af68853058d835def87db429'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/vaadin-framework.git/tree/?id=f71f751852ca8136af68853058d835def87db429'>root</a>/<a href='/vaadin-framework.git/tree/server?id=f71f751852ca8136af68853058d835def87db429'>server</a>/<a href='/vaadin-framework.git/tree/server/src?id=f71f751852ca8136af68853058d835def87db429'>src</a>/<a href='/vaadin-framework.git/tree/server/src/main?id=f71f751852ca8136af68853058d835def87db429'>main</a>/<a href='/vaadin-framework.git/tree/server/src/main/java?id=f71f751852ca8136af68853058d835def87db429'>java</a>/<a href='/vaadin-framework.git/tree/server/src/main/java/com?id=f71f751852ca8136af68853058d835def87db429'>com</a>/<a href='/vaadin-framework.git/tree/server/src/main/java/com/vaadin?id=f71f751852ca8136af68853058d835def87db429'>vaadin</a>/<a href='/vaadin-framework.git/tree/server/src/main/java/com/vaadin/ui?id=f71f751852ca8136af68853058d835def87db429'>ui</a>/<a href='/vaadin-framework.git/tree/server/src/main/java/com/vaadin/ui/DateTimeField.java?id=f71f751852ca8136af68853058d835def87db429'>DateTimeField.java</a></div><div class='content'>blob: c3b65cbaac9cf5f012f86e37c76df9a527a996cb (<a href='/vaadin-framework.git/plain/server/src/main/java/com/vaadin/ui/DateTimeField.java?id=f71f751852ca8136af68853058d835def87db429'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
<a id='n24' href='#n24'>24</a>
<a id='n25' href='#n25'>25</a>
<a id='n26' href='#n26'>26</a>
<a id='n27' href='#n27'>27</a>
<a id='n28' href='#n28'>28</a>
<a id='n29' href='#n29'>29</a>
<a id='n30' href='#n30'>30</a>
<a id='n31' href='#n31'>31</a>
<a id='n32' href='#n32'>32</a>
<a id='n33' href='#n33'>33</a>
<a id='n34' href='#n34'>34</a>
<a id='n35' href='#n35'>35</a>
<a id='n36' href='#n36'>36</a>
<a id='n37' href='#n37'>37</a>
<a id='n38' href='#n38'>38</a>
<a id='n39' href='#n39'>39</a>
<a id='n40' href='#n40'>40</a>
<a id='n41' href='#n41'>41</a>
<a id='n42' href='#n42'>42</a>
<a id='n43' href='#n43'>43</a>
<a id='n44' href='#n44'>44</a>
<a id='n45' href='#n45'>45</a>
<a id='n46' href='#n46'>46</a>
<a id='n47' href='#n47'>47</a>
<a id='n48' href='#n48'>48</a>
<a id='n49' href='#n49'>49</a>
<a id='n50' href='#n50'>50</a>
<a id='n51' href='#n51'>51</a>
<a id='n52' href='#n52'>52</a>
<a id='n53' href='#n53'>53</a>
<a id='n54' href='#n54'>54</a>
<a id='n55' href='#n55'>55</a>
<a id='n56' href='#n56'>56</a>
<a id='n57' href='#n57'>57</a>
<a id='n58' href='#n58'>58</a>
<a id='n59' href='#n59'>59</a>
<a id='n60' href='#n60'>60</a>
<a id='n61' href='#n61'>61</a>
<a id='n62' href='#n62'>62</a>
<a id='n63' href='#n63'>63</a>
<a id='n64' href='#n64'>64</a>
<a id='n65' href='#n65'>65</a>
<a id='n66' href='#n66'>66</a>
<a id='n67' href='#n67'>67</a>
<a id='n68' href='#n68'>68</a>
<a id='n69' href='#n69'>69</a>
<a id='n70' href='#n70'>70</a>
<a id='n71' href='#n71'>71</a>
<a id='n72' href='#n72'>72</a>
<a id='n73' href='#n73'>73</a>
<a id='n74' href='#n74'>74</a>
<a id='n75' href='#n75'>75</a>
<a id='n76' href='#n76'>76</a>
<a id='n77' href='#n77'>77</a>
<a id='n78' href='#n78'>78</a>
<a id='n79' href='#n79'>79</a>
<a id='n80' href='#n80'>80</a>
<a id='n81' href='#n81'>81</a>
<a id='n82' href='#n82'>82</a>
<a id='n83' href='#n83'>83</a>
<a id='n84' href='#n84'>84</a>
<a id='n85' href='#n85'>85</a>
<a id='n86' href='#n86'>86</a>
<a id='n87' href='#n87'>87</a>
<a id='n88' href='#n88'>88</a>
<a id='n89' href='#n89'>89</a>
<a id='n90' href='#n90'>90</a>
<a id='n91' href='#n91'>91</a>
<a id='n92' href='#n92'>92</a>
<a id='n93' href='#n93'>93</a>
<a id='n94' href='#n94'>94</a>
<a id='n95' href='#n95'>95</a>
<a id='n96' href='#n96'>96</a>
<a id='n97' href='#n97'>97</a>
<a id='n98' href='#n98'>98</a>
<a id='n99' href='#n99'>99</a>
<a id='n100' href='#n100'>100</a>
<a id='n101' href='#n101'>101</a>
<a id='n102' href='#n102'>102</a>
<a id='n103' href='#n103'>103</a>
<a id='n104' href='#n104'>104</a>
<a id='n105' href='#n105'>105</a>
<a id='n106' href='#n106'>106</a>
<a id='n107' href='#n107'>107</a>
<a id='n108' href='#n108'>108</a>
<a id='n109' href='#n109'>109</a>
<a id='n110' href='#n110'>110</a>
<a id='n111' href='#n111'>111</a>
<a id='n112' href='#n112'>112</a>
<a id='n113' href='#n113'>113</a>
<a id='n114' href='#n114'>114</a>
<a id='n115' href='#n115'>115</a>
<a id='n116' href='#n116'>116</a>
<a id='n117' href='#n117'>117</a>
<a id='n118' href='#n118'>118</a>
<a id='n119' href='#n119'>119</a>
<a id='n120' href='#n120'>120</a>
<a id='n121' href='#n121'>121</a>
<a id='n122' href='#n122'>122</a>
<a id='n123' href='#n123'>123</a>
<a id='n124' href='#n124'>124</a>
<a id='n125' href='#n125'>125</a>
<a id='n126' href='#n126'>126</a>
<a id='n127' href='#n127'>127</a>
<a id='n128' href='#n128'>128</a>
<a id='n129' href='#n129'>129</a>
<a id='n130' href='#n130'>130</a>
<a id='n131' href='#n131'>131</a>
<a id='n132' href='#n132'>132</a>
<a id='n133' href='#n133'>133</a>
<a id='n134' href='#n134'>134</a>
<a id='n135' href='#n135'>135</a>
<a id='n136' href='#n136'>136</a>
<a id='n137' href='#n137'>137</a>
<a id='n138' href='#n138'>138</a>
<a id='n139' href='#n139'>139</a>
<a id='n140' href='#n140'>140</a>
<a id='n141' href='#n141'>141</a>
<a id='n142' href='#n142'>142</a>
<a id='n143' href='#n143'>143</a>
<a id='n144' href='#n144'>144</a>
<a id='n145' href='#n145'>145</a>
<a id='n146' href='#n146'>146</a>
<a id='n147' href='#n147'>147</a>
<a id='n148' href='#n148'>148</a>
<a id='n149' href='#n149'>149</a>
<a id='n150' href='#n150'>150</a>
<a id='n151' href='#n151'>151</a>
<a id='n152' href='#n152'>152</a>
<a id='n153' href='#n153'>153</a>
<a id='n154' href='#n154'>154</a>
<a id='n155' href='#n155'>155</a>
<a id='n156' href='#n156'>156</a>
<a id='n157' href='#n157'>157</a>
<a id='n158' href='#n158'>158</a>
<a id='n159' href='#n159'>159</a>
<a id='n160' href='#n160'>160</a>
<a id='n161' href='#n161'>161</a>
<a id='n162' href='#n162'>162</a>
<a id='n163' href='#n163'>163</a>
<a id='n164' href='#n164'>164</a>
<a id='n165' href='#n165'>165</a>
<a id='n166' href='#n166'>166</a>
<a id='n167' href='#n167'>167</a>
<a id='n168' href='#n168'>168</a>
<a id='n169' href='#n169'>169</a>
<a id='n170' href='#n170'>170</a>
<a id='n171' href='#n171'>171</a>
<a id='n172' href='#n172'>172</a>
<a id='n173' href='#n173'>173</a>
<a id='n174' href='#n174'>174</a>
<a id='n175' href='#n175'>175</a>
<a id='n176' href='#n176'>176</a>
<a id='n177' href='#n177'>177</a>
<a id='n178' href='#n178'>178</a>
<a id='n179' href='#n179'>179</a>
<a id='n180' href='#n180'>180</a>
<a id='n181' href='#n181'>181</a>
<a id='n182' href='#n182'>182</a>
<a id='n183' href='#n183'>183</a>
<a id='n184' href='#n184'>184</a>
<a id='n185' href='#n185'>185</a>
<a id='n186' href='#n186'>186</a>
<a id='n187' href='#n187'>187</a>
<a id='n188' href='#n188'>188</a>
<a id='n189' href='#n189'>189</a>
<a id='n190' href='#n190'>190</a>
<a id='n191' href='#n191'>191</a>
<a id='n192' href='#n192'>192</a>
</pre></td>
<td class='lines'><pre><code><style>pre { line-height: 125%; }
td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span></span><span class="cm">/*</span>
<span class="cm"> * Copyright 2000-2016 Vaadin Ltd.</span>
<span class="cm"> *</span>
<span class="cm"> * Licensed under the Apache License, Version 2.0 (the &quot;License&quot;); you may not</span>
<span class="cm"> * use this file except in compliance with the License. You may obtain a copy of</span>
<span class="cm"> * the License at</span>
<span class="cm"> *</span>
<span class="cm"> * http://www.apache.org/licenses/LICENSE-2.0</span>
<span class="cm"> *</span>
<span class="cm"> * Unless required by applicable law or agreed to in writing, software</span>
<span class="cm"> * distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT</span>
<span class="cm"> * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the</span>
<span class="cm"> * License for the specific language governing permissions and limitations under</span>
<span class="cm"> * the License.</span>
<span class="cm"> */</span>
<span class="kn">package</span><span class="w"> </span><span class="nn">com.vaadin.ui</span><span class="p">;</span>

<span class="kn">import</span><span class="w"> </span><span class="nn">java.time.LocalDateTime</span><span class="p">;</span>

<span class="kn">import</span><span class="w"> </span><span class="nn">com.vaadin.shared.ui.datefield.LocalDateTimeFieldState</span><span class="p">;</span>

<span class="cm">/**</span>
<span class="cm"> * A date time entry component, which displays the actual date selector as a</span>
<span class="cm"> * popup.</span>
<span class="cm"> *</span>
<span class="cm"> * @see AbstractLocalDateTimeField</span>
<span class="cm"> * @see InlineDateTimeField</span>
<span class="cm"> * @author Vaadin Ltd.</span>
<span class="cm"> * @since 8.0</span>
<span class="cm"> */</span>
<span class="kd">public</span><span class="w"> </span><span class="kd">class</span> <span class="nc">DateTimeField</span><span class="w"> </span><span class="kd">extends</span><span class="w"> </span><span class="n">AbstractLocalDateTimeField</span><span class="w"> </span><span class="p">{</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Constructs an empty &lt;code&gt;DateTimeField&lt;/code&gt; with no caption.</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="nf">DateTimeField</span><span class="p">()</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="kd">super</span><span class="p">();</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Constructs a new &lt;code&gt;DateTimeField&lt;/code&gt; with the given caption and</span>
<span class="cm">     * initial text contents.</span>
<span class="cm">     *</span>
<span class="cm">     * @param caption</span>
<span class="cm">     *            the caption &lt;code&gt;String&lt;/code&gt; for the editor.</span>
<span class="cm">     * @param value</span>
<span class="cm">     *            the LocalDateTime value.</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="nf">DateTimeField</span><span class="p">(</span><span class="n">String</span><span class="w"> </span><span class="n">caption</span><span class="p">,</span><span class="w"> </span><span class="n">LocalDateTime</span><span class="w"> </span><span class="n">value</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="kd">super</span><span class="p">(</span><span class="n">caption</span><span class="p">,</span><span class="w"> </span><span class="n">value</span><span class="p">);</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Constructs an empty &lt;code&gt;DateTimeField&lt;/code&gt; with caption.</span>
<span class="cm">     *</span>
<span class="cm">     * @param caption</span>
<span class="cm">     *            the caption of the datefield.</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="nf">DateTimeField</span><span class="p">(</span><span class="n">String</span><span class="w"> </span><span class="n">caption</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="kd">super</span><span class="p">(</span><span class="n">caption</span><span class="p">);</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Constructs a new {@code DateTimeField} with a value change listener.</span>
<span class="cm">     * &lt;p&gt;</span>
<span class="cm">     * The listener is called when the value of this {@code DateTimeField} is</span>
<span class="cm">     * changed either by the user or programmatically.</span>
<span class="cm">     *</span>
<span class="cm">     * @param valueChangeListener</span>
<span class="cm">     *            the value change listener, not {@code null}</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="nf">DateTimeField</span><span class="p">(</span>
<span class="w">            </span><span class="n">ValueChangeListener</span><span class="o">&lt;</span><span class="n">LocalDateTime</span><span class="o">&gt;</span><span class="w"> </span><span class="n">valueChangeListener</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="kd">super</span><span class="p">();</span>
<span class="w">        </span><span class="n">addValueChangeListener</span><span class="p">(</span><span class="n">valueChangeListener</span><span class="p">);</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Constructs a new {@code DateTimeField} with the given caption and a value</span>
<span class="cm">     * change listener.</span>
<span class="cm">     * &lt;p&gt;</span>
<span class="cm">     * The listener is called when the value of this {@code DateTimeField} is</span>
<span class="cm">     * changed either by the user or programmatically.</span>
<span class="cm">     *</span>
<span class="cm">     * @param caption</span>
<span class="cm">     *            the caption for the field</span>
<span class="cm">     * @param valueChangeListener</span>
<span class="cm">     *            the value change listener, not {@code null}</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="nf">DateTimeField</span><span class="p">(</span><span class="n">String</span><span class="w"> </span><span class="n">caption</span><span class="p">,</span>
<span class="w">            </span><span class="n">ValueChangeListener</span><span class="o">&lt;</span><span class="n">LocalDateTime</span><span class="o">&gt;</span><span class="w"> </span><span class="n">valueChangeListener</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="k">this</span><span class="p">(</span><span class="n">valueChangeListener</span><span class="p">);</span>
<span class="w">        </span><span class="n">setCaption</span><span class="p">(</span><span class="n">caption</span><span class="p">);</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Constructs a new {@code DateTimeField} with the given caption, initial</span>
<span class="cm">     * text contents and a value change listener.</span>
<span class="cm">     * &lt;p&gt;</span>
<span class="cm">     * The listener is called when the value of this {@code DateTimeField} is</span>
<span class="cm">     * changed either by the user or programmatically.</span>
<span class="cm">     *</span>
<span class="cm">     * @param caption</span>
<span class="cm">     *            the caption for the field</span>
<span class="cm">     * @param value</span>
<span class="cm">     *            the value for the field, not {@code null}</span>
<span class="cm">     * @param valueChangeListener</span>
<span class="cm">     *            the value change listener, not {@code null}</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="nf">DateTimeField</span><span class="p">(</span><span class="n">String</span><span class="w"> </span><span class="n">caption</span><span class="p">,</span><span class="w"> </span><span class="n">LocalDateTime</span><span class="w"> </span><span class="n">value</span><span class="p">,</span>
<span class="w">            </span><span class="n">ValueChangeListener</span><span class="o">&lt;</span><span class="n">LocalDateTime</span><span class="o">&gt;</span><span class="w"> </span><span class="n">valueChangeListener</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="k">this</span><span class="p">(</span><span class="n">caption</span><span class="p">,</span><span class="w"> </span><span class="n">value</span><span class="p">);</span>
<span class="w">        </span><span class="n">addValueChangeListener</span><span class="p">(</span><span class="n">valueChangeListener</span><span class="p">);</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Returns the current placeholder text.</span>
<span class="cm">     *</span>
<span class="cm">     * @see #setPlaceholder(String)</span>
<span class="cm">     * @return the placeholder text</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="n">String</span><span class="w"> </span><span class="nf">getPlaceholder</span><span class="p">()</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="k">return</span><span class="w"> </span><span class="n">getState</span><span class="p">(</span><span class="kc">false</span><span class="p">).</span><span class="na">placeholder</span><span class="p">;</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Sets the placeholder text. The placeholder is text that is displayed when</span>
<span class="cm">     * the field would otherwise be empty, to prompt the user for input.</span>
<span class="cm">     *</span>
<span class="cm">     * @param placeholder</span>
<span class="cm">     *            the placeholder text to set</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">setPlaceholder</span><span class="p">(</span><span class="n">String</span><span class="w"> </span><span class="n">placeholder</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="n">getState</span><span class="p">().</span><span class="na">placeholder</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">placeholder</span><span class="p">;</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="nd">@Override</span>
<span class="w">    </span><span class="kd">protected</span><span class="w"> </span><span class="n">LocalDateTimeFieldState</span><span class="w"> </span><span class="nf">getState</span><span class="p">()</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="k">return</span><span class="w"> </span><span class="p">(</span><span class="n">LocalDateTimeFieldState</span><span class="p">)</span><span class="w"> </span><span class="kd">super</span><span class="p">.</span><span class="na">getState</span><span class="p">();</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="nd">@Override</span>
<span class="w">    </span><span class="kd">protected</span><span class="w"> </span><span class="n">LocalDateTimeFieldState</span><span class="w"> </span><span class="nf">getState</span><span class="p">(</span><span class="kt">boolean</span><span class="w"> </span><span class="n">markAsDirty</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="k">return</span><span class="w"> </span><span class="p">(</span><span class="n">LocalDateTimeFieldState</span><span class="p">)</span><span class="w"> </span><span class="kd">super</span><span class="p">.</span><span class="na">getState</span><span class="p">(</span><span class="n">markAsDirty</span><span class="p">);</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Checks whether the text field is enabled (default) or not.</span>
<span class="cm">     *</span>
<span class="cm">     * @see #setTextFieldEnabled(boolean)</span>
<span class="cm">     *</span>
<span class="cm">     * @return &lt;b&gt;true&lt;/b&gt; if the text field is enabled, &lt;b&gt;false&lt;/b&gt; otherwise.</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="kt">boolean</span><span class="w"> </span><span class="nf">isTextFieldEnabled</span><span class="p">()</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="k">return</span><span class="w"> </span><span class="n">getState</span><span class="p">(</span><span class="kc">false</span><span class="p">).</span><span class="na">textFieldEnabled</span><span class="p">;</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Enables or disables the text field. By default the text field is enabled.</span>
<span class="cm">     * Disabling it causes only the button for date selection to be active, thus</span>
<span class="cm">     * preventing the user from entering invalid dates.</span>
<span class="cm">     *</span>
<span class="cm">     * See &lt;a href=&quot;http://dev.vaadin.com/ticket/6790&quot;&gt;issue 6790&lt;/a&gt;.</span>
<span class="cm">     *</span>
<span class="cm">     * @param state</span>
<span class="cm">     *            &lt;b&gt;true&lt;/b&gt; to enable text field, &lt;b&gt;false&lt;/b&gt; to disable it.</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">setTextFieldEnabled</span><span class="p">(</span><span class="kt">boolean</span><span class="w"> </span><span class="n">state</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="n">getState</span><span class="p">().</span><span class="na">textFieldEnabled</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">state</span><span class="p">;</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Set a description that explains the usage of the Widget for users of</span>
<span class="cm">     * assistive devices.</span>
<span class="cm">     *</span>
<span class="cm">     * @param description</span>
<span class="cm">     *            String with the description</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">setAssistiveText</span><span class="p">(</span><span class="n">String</span><span class="w"> </span><span class="n">description</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="n">getState</span><span class="p">().</span><span class="na">descriptionForAssistiveDevices</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">description</span><span class="p">;</span>
<span class="w">    </span><span class="p">}</span>

<span class="w">    </span><span class="cm">/**</span>
<span class="cm">     * Get the description that explains the usage of the Widget for users of</span>
<span class="cm">     * assistive devices.</span>
<span class="cm">     *</span>
<span class="cm">     * @return String with the description</span>
<span class="cm">     */</span>
<span class="w">    </span><span class="kd">public</span><span class="w"> </span><span class="n">String</span><span class="w"> </span><span class="nf">getAssistiveText</span><span class="p">()</span><span class="w"> </span><span class="p">{</span>
<span class="w">        </span><span class="k">return</span><span class="w"> </span><span class="n">getState</span><span class="p">(</span><span class="kc">false</span><span class="p">).</span><span class="na">descriptionForAssistiveDevices</span><span class="p">;</span>
<span class="w">    </span><span class="p">}</span>
<span class="p">}</span>
</pre></div>
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.3</a> (<a href='https://git-scm.com/'>git 2.39.1</a>) at 2025-07-24 05:06:16 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>
'>939</a>
<a id='n940' href='#n940'>940</a>
<a id='n941' href='#n941'>941</a>
<a id='n942' href='#n942'>942</a>
<a id='n943' href='#n943'>943</a>
<a id='n944' href='#n944'>944</a>
<a id='n945' href='#n945'>945</a>
<a id='n946' href='#n946'>946</a>
<a id='n947' href='#n947'>947</a>
<a id='n948' href='#n948'>948</a>
<a id='n949' href='#n949'>949</a>
<a id='n950' href='#n950'>950</a>
<a id='n951' href='#n951'>951</a>
<a id='n952' href='#n952'>952</a>
<a id='n953' href='#n953'>953</a>
<a id='n954' href='#n954'>954</a>
<a id='n955' href='#n955'>955</a>
<a id='n956' href='#n956'>956</a>
<a id='n957' href='#n957'>957</a>
<a id='n958' href='#n958'>958</a>
<a id='n959' href='#n959'>959</a>
<a id='n960' href='#n960'>960</a>
<a id='n961' href='#n961'>961</a>
<a id='n962' href='#n962'>962</a>
<a id='n963' href='#n963'>963</a>
<a id='n964' href='#n964'>964</a>
<a id='n965' href='#n965'>965</a>
<a id='n966' href='#n966'>966</a>
<a id='n967' href='#n967'>967</a>
<a id='n968' href='#n968'>968</a>
<a id='n969' href='#n969'>969</a>
<a id='n970' href='#n970'>970</a>
<a id='n971' href='#n971'>971</a>
<a id='n972' href='#n972'>972</a>
<a id='n973' href='#n973'>973</a>
<a id='n974' href='#n974'>974</a>
<a id='n975' href='#n975'>975</a>
<a id='n976' href='#n976'>976</a>
<a id='n977' href='#n977'>977</a>
<a id='n978' href='#n978'>978</a>
<a id='n979' href='#n979'>979</a>
<a id='n980' href='#n980'>980</a>
<a id='n981' href='#n981'>981</a>
<a id='n982' href='#n982'>982</a>
<a id='n983' href='#n983'>983</a>
<a id='n984' href='#n984'>984</a>
<a id='n985' href='#n985'>985</a>
<a id='n986' href='#n986'>986</a>
<a id='n987' href='#n987'>987</a>
<a id='n988' href='#n988'>988</a>
<a id='n989' href='#n989'>989</a>
<a id='n990' href='#n990'>990</a>
<a id='n991' href='#n991'>991</a>
<a id='n992' href='#n992'>992</a>
<a id='n993' href='#n993'>993</a>
<a id='n994' href='#n994'>994</a>
<a id='n995' href='#n995'>995</a>
<a id='n996' href='#n996'>996</a>
<a id='n997' href='#n997'>997</a>
<a id='n998' href='#n998'>998</a>
<a id='n999' href='#n999'>999</a>
<a id='n1000' href='#n1000'>1000</a>
<a id='n1001' href='#n1001'>1001</a>
<a id='n1002' href='#n1002'>1002</a>
<a id='n1003' href='#n1003'>1003</a>
<a id='n1004' href='#n1004'>1004</a>
<a id='n1005' href='#n1005'>1005</a>
<a id='n1006' href='#n1006'>1006</a>
<a id='n1007' href='#n1007'>1007</a>
<a id='n1008' href='#n1008'>1008</a>
<a id='n1009' href='#n1009'>1009</a>
<a id='n1010' href='#n1010'>1010</a>
<a id='n1011' href='#n1011'>1011</a>
<a id='n1012' href='#n1012'>1012</a>
<a id='n1013' href='#n1013'>1013</a>
<a id='n1014' href='#n1014'>1014</a>
<a id='n1015' href='#n1015'>1015</a>
<a id='n1016' href='#n1016'>1016</a>
<a id='n1017' href='#n1017'>1017</a>
<a id='n1018' href='#n1018'>1018</a>
<a id='n1019' href='#n1019'>1019</a>
<a id='n1020' href='#n1020'>1020</a>
<a id='n1021' href='#n1021'>1021</a>
<a id='n1022' href='#n1022'>1022</a>
<a id='n1023' href='#n1023'>1023</a>
<a id='n1024' href='#n1024'>1024</a>
<a id='n1025' href='#n1025'>1025</a>
<a id='n1026' href='#n1026'>1026</a>
<a id='n1027' href='#n1027'>1027</a>
<a id='n1028' href='#n1028'>1028</a>
<a id='n1029' href='#n1029'>1029</a>
<a id='n1030' href='#n1030'>1030</a>
<a id='n1031' href='#n1031'>1031</a>
<a id='n1032' href='#n1032'>1032</a>
<a id='n1033' href='#n1033'>1033</a>
<a id='n1034' href='#n1034'>1034</a>
<a id='n1035' href='#n1035'>1035</a>
<a id='n1036' href='#n1036'>1036</a>
<a id='n1037' href='#n1037'>1037</a>
<a id='n1038' href='#n1038'>1038</a>
<a id='n1039' href='#n1039'>1039</a>
<a id='n1040' href='#n1040'>1040</a>
<a id='n1041' href='#n1041'>1041</a>
<a id='n1042' href='#n1042'>1042</a>
<a id='n1043' href='#n1043'>1043</a>
<a id='n1044' href='#n1044'>1044</a>
<a id='n1045' href='#n1045'>1045</a>
<a id='n1046' href='#n1046'>1046</a>
<a id='n1047' href='#n1047'>1047</a>
<a id='n1048' href='#n1048'>1048</a>
<a id='n1049' href='#n1049'>1049</a>
<a id='n1050' href='#n1050'>1050</a>
<a id='n1051' href='#n1051'>1051</a>
<a id='n1052' href='#n1052'>1052</a>
<a id='n1053' href='#n1053'>1053</a>
<a id='n1054' href='#n1054'>1054</a>
<a id='n1055' href='#n1055'>1055</a>
<a id='n1056' href='#n1056'>1056</a>
<a id='n1057' href='#n1057'>1057</a>
<a id='n1058' href='#n1058'>1058</a>
<a id='n1059' href='#n1059'>1059</a>
<a id='n1060' href='#n1060'>1060</a>
<a id='n1061' href='#n1061'>1061</a>
<a id='n1062' href='#n1062'>1062</a>
<a id='n1063' href='#n1063'>1063</a>
<a id='n1064' href='#n1064'>1064</a>
<a id='n1065' href='#n1065'>1065</a>
<a id='n1066' href='#n1066'>1066</a>
<a id='n1067' href='#n1067'>1067</a>
<a id='n1068' href='#n1068'>1068</a>
<a id='n1069' href='#n1069'>1069</a>
<a id='n1070' href='#n1070'>1070</a>
<a id='n1071' href='#n1071'>1071</a>
<a id='n1072' href='#n1072'>1072</a>
<a id='n1073' href='#n1073'>1073</a>
<a id='n1074' href='#n1074'>1074</a>
<a id='n1075' href='#n1075'>1075</a>
<a id='n1076' href='#n1076'>1076</a>
<a id='n1077' href='#n1077'>1077</a>
<a id='n1078' href='#n1078'>1078</a>
<a id='n1079' href='#n1079'>1079</a>
<a id='n1080' href='#n1080'>1080</a>
<a id='n1081' href='#n1081'>1081</a>
<a id='n1082' href='#n1082'>1082</a>
<a id='n1083' href='#n1083'>1083</a>
<a id='n1084' href='#n1084'>1084</a>
<a id='n1085' href='#n1085'>1085</a>
<a id='n1086' href='#n1086'>1086</a>
<a id='n1087' href='#n1087'>1087</a>
<a id='n1088' href='#n1088'>1088</a>
<a id='n1089' href='#n1089'>1089</a>
<a id='n1090' href='#n1090'>1090</a>
<a id='n1091' href='#n1091'>1091</a>
<a id='n1092' href='#n1092'>1092</a>
<a id='n1093' href='#n1093'>1093</a>
<a id='n1094' href='#n1094'>1094</a>
<a id='n1095' href='#n1095'>1095</a>
<a id='n1096' href='#n1096'>1096</a>
<a id='n1097' href='#n1097'>1097</a>
<a id='n1098' href='#n1098'>1098</a>
<a id='n1099' href='#n1099'>1099</a>
<a id='n1100' href='#n1100'>1100</a>
<a id='n1101' href='#n1101'>1101</a>
<a id='n1102' href='#n1102'>1102</a>
<a id='n1103' href='#n1103'>1103</a>
<a id='n1104' href='#n1104'>1104</a>
<a id='n1105' href='#n1105'>1105</a>
<a id='n1106' href='#n1106'>1106</a>
<a id='n1107' href='#n1107'>1107</a>
<a id='n1108' href='#n1108'>1108</a>
<a id='n1109' href='#n1109'>1109</a>
<a id='n1110' href='#n1110'>1110</a>
<a id='n1111' href='#n1111'>1111</a>
<a id='n1112' href='#n1112'>1112</a>
<a id='n1113' href='#n1113'>1113</a>
<a id='n1114' href='#n1114'>1114</a>
<a id='n1115' href='#n1115'>1115</a>
<a id='n1116' href='#n1116'>1116</a>
<a id='n1117' href='#n1117'>1117</a>
<a id='n1118' href='#n1118'>1118</a>
<a id='n1119' href='#n1119'>1119</a>
<a id='n1120' href='#n1120'>1120</a>
<a id='n1121' href='#n1121'>1121</a>
<a id='n1122' href='#n1122'>1122</a>
<a id='n1123' href='#n1123'>1123</a>
<a id='n1124' href='#n1124'>1124</a>
<a id='n1125' href='#n1125'>1125</a>
<a id='n1126' href='#n1126'>1126</a>
<a id='n1127' href='#n1127'>1127</a>
<a id='n1128' href='#n1128'>1128</a>
<a id='n1129' href='#n1129'>1129</a>
<a id='n1130' href='#n1130'>1130</a>
<a id='n1131' href='#n1131'>1131</a>
<a id='n1132' href='#n1132'>1132</a>
<a id='n1133' href='#n1133'>1133</a>
<a id='n1134' href='#n1134'>1134</a>
<a id='n1135' href='#n1135'>1135</a>
<a id='n1136' href='#n1136'>1136</a>
<a id='n1137' href='#n1137'>1137</a>
<a id='n1138' href='#n1138'>1138</a>
<a id='n1139' href='#n1139'>1139</a>
<a id='n1140' href='#n1140'>1140</a>
<a id='n1141' href='#n1141'>1141</a>
<a id='n1142' href='#n1142'>1142</a>
<a id='n1143' href='#n1143'>1143</a>
<a id='n1144' href='#n1144'>1144</a>
<a id='n1145' href='#n1145'>1145</a>
<a id='n1146' href='#n1146'>1146</a>
<a id='n1147' href='#n1147'>1147</a>
<a id='n1148' href='#n1148'>1148</a>
<a id='n1149' href='#n1149'>1149</a>
<a id='n1150' href='#n1150'>1150</a>
<a id='n1151' href='#n1151'>1151</a>
<a id='n1152' href='#n1152'>1152</a>
<a id='n1153' href='#n1153'>1153</a>
<a id='n1154' href='#n1154'>1154</a>
<a id='n1155' href='#n1155'>1155</a>
<a id='n1156' href='#n1156'>1156</a>
<a id='n1157' href='#n1157'>1157</a>
<a id='n1158' href='#n1158'>1158</a>
<a id='n1159' href='#n1159'>1159</a>
<a id='n1160' href='#n1160'>1160</a>
<a id='n1161' href='#n1161'>1161</a>
<a id='n1162' href='#n1162'>1162</a>
<a id='n1163' href='#n1163'>1163</a>
<a id='n1164' href='#n1164'>1164</a>
<a id='n1165' href='#n1165'>1165</a>
<a id='n1166' href='#n1166'>1166</a>
<a id='n1167' href='#n1167'>1167</a>
<a id='n1168' href='#n1168'>1168</a>
<a id='n1169' href='#n1169'>1169</a>
<a id='n1170' href='#n1170'>1170</a>
<a id='n1171' href='#n1171'>1171</a>
<a id='n1172' href='#n1172'>1172</a>
<a id='n1173' href='#n1173'>1173</a>
<a id='n1174' href='#n1174'>1174</a>
<a id='n1175' href='#n1175'>1175</a>
<a id='n1176' href='#n1176'>1176</a>
<a id='n1177' href='#n1177'>1177</a>
<a id='n1178' href='#n1178'>1178</a>
<a id='n1179' href='#n1179'>1179</a>
<a id='n1180' href='#n1180'>1180</a>
<a id='n1181' href='#n1181'>1181</a>
<a id='n1182' href='#n1182'>1182</a>
<a id='n1183' href='#n1183'>1183</a>
<a id='n1184' href='#n1184'>1184</a>
<a id='n1185' href='#n1185'>1185</a>
<a id='n1186' href='#n1186'>1186</a>
<a id='n1187' href='#n1187'>1187</a>
<a id='n1188' href='#n1188'>1188</a>
<a id='n1189' href='#n1189'>1189</a>
<a id='n1190' href='#n1190'>1190</a>
<a id='n1191' href='#n1191'>1191</a>
<a id='n1192' href='#n1192'>1192</a>
<a id='n1193' href='#n1193'>1193</a>
<a id='n1194' href='#n1194'>1194</a>
<a id='n1195' href='#n1195'>1195</a>
<a id='n1196' href='#n1196'>1196</a>
<a id='n1197' href='#n1197'>1197</a>
<a id='n1198' href='#n1198'>1198</a>
<a id='n1199' href='#n1199'>1199</a>
<a id='n1200' href='#n1200'>1200</a>
<a id='n1201' href='#n1201'>1201</a>
<a id='n1202' href='#n1202'>1202</a>
<a id='n1203' href='#n1203'>1203</a>
<a id='n1204' href='#n1204'>1204</a>
<a id='n1205' href='#n1205'>1205</a>
<a id='n1206' href='#n1206'>1206</a>
<a id='n1207' href='#n1207'>1207</a>
<a id='n1208' href='#n1208'>1208</a>
<a id='n1209' href='#n1209'>1209</a>
<a id='n1210' href='#n1210'>1210</a>
<a id='n1211' href='#n1211'>1211</a>
<a id='n1212' href='#n1212'>1212</a>
<a id='n1213' href='#n1213'>1213</a>
<a id='n1214' href='#n1214'>1214</a>
<a id='n1215' href='#n1215'>1215</a>
<a id='n1216' href='#n1216'>1216</a>
<a id='n1217' href='#n1217'>1217</a>
<a id='n1218' href='#n1218'>1218</a>
<a id='n1219' href='#n1219'>1219</a>
<a id='n1220' href='#n1220'>1220</a>
<a id='n1221' href='#n1221'>1221</a>
<a id='n1222' href='#n1222'>1222</a>
<a id='n1223' href='#n1223'>1223</a>
<a id='n1224' href='#n1224'>1224</a>
<a id='n1225' href='#n1225'>1225</a>
<a id='n1226' href='#n1226'>1226</a>
<a id='n1227' href='#n1227'>1227</a>
<a id='n1228' href='#n1228'>1228</a>
<a id='n1229' href='#n1229'>1229</a>
<a id='n1230' href='#n1230'>1230</a>
<a id='n1231' href='#n1231'>1231</a>
<a id='n1232' href='#n1232'>1232</a>
<a id='n1233' href='#n1233'>1233</a>
<a id='n1234' href='#n1234'>1234</a>
<a id='n1235' href='#n1235'>1235</a>
<a id='n1236' href='#n1236'>1236</a>
<a id='n1237' href='#n1237'>1237</a>
<a id='n1238' href='#n1238'>1238</a>
<a id='n1239' href='#n1239'>1239</a>
<a id='n1240' href='#n1240'>1240</a>
<a id='n1241' href='#n1241'>1241</a>
<a id='n1242' href='#n1242'>1242</a>
<a id='n1243' href='#n1243'>1243</a>
<a id='n1244' href='#n1244'>1244</a>
<a id='n1245' href='#n1245'>1245</a>
<a id='n1246' href='#n1246'>1246</a>
<a id='n1247' href='#n1247'>1247</a>
<a id='n1248' href='#n1248'>1248</a>
<a id='n1249' href='#n1249'>1249</a>
<a id='n1250' href='#n1250'>1250</a>
<a id='n1251' href='#n1251'>1251</a>
<a id='n1252' href='#n1252'>1252</a>
<a id='n1253' href='#n1253'>1253</a>
<a id='n1254' href='#n1254'>1254</a>
<a id='n1255' href='#n1255'>1255</a>
<a id='n1256' href='#n1256'>1256</a>
<a id='n1257' href='#n1257'>1257</a>
<a id='n1258' href='#n1258'>1258</a>
<a id='n1259' href='#n1259'>1259</a>
<a id='n1260' href='#n1260'>1260</a>
<a id='n1261' href='#n1261'>1261</a>
<a id='n1262' href='#n1262'>1262</a>
<a id='n1263' href='#n1263'>1263</a>
<a id='n1264' href='#n1264'>1264</a>
<a id='n1265' href='#n1265'>1265</a>
<a id='n1266' href='#n1266'>1266</a>
<a id='n1267' href='#n1267'>1267</a>
<a id='n1268' href='#n1268'>1268</a>
<a id='n1269' href='#n1269'>1269</a>
<a id='n1270' href='#n1270'>1270</a>
<a id='n1271' href='#n1271'>1271</a>
<a id='n1272' href='#n1272'>1272</a>
<a id='n1273' href='#n1273'>1273</a>
<a id='n1274' href='#n1274'>1274</a>
<a id='n1275' href='#n1275'>1275</a>
<a id='n1276' href='#n1276'>1276</a>
<a id='n1277' href='#n1277'>1277</a>
<a id='n1278' href='#n1278'>1278</a>
<a id='n1279' href='#n1279'>1279</a>
<a id='n1280' href='#n1280'>1280</a>
<a id='n1281' href='#n1281'>1281</a>
<a id='n1282' href='#n1282'>1282</a>
<a id='n1283' href='#n1283'>1283</a>
<a id='n1284' href='#n1284'>1284</a>
<a id='n1285' href='#n1285'>1285</a>
<a id='n1286' href='#n1286'>1286</a>
<a id='n1287' href='#n1287'>1287</a>
<a id='n1288' href='#n1288'>1288</a>
<a id='n1289' href='#n1289'>1289</a>
<a id='n1290' href='#n1290'>1290</a>
<a id='n1291' href='#n1291'>1291</a>
<a id='n1292' href='#n1292'>1292</a>
<a id='n1293' href='#n1293'>1293</a>
<a id='n1294' href='#n1294'>1294</a>
<a id='n1295' href='#n1295'>1295</a>
<a id='n1296' href='#n1296'>1296</a>
<a id='n1297' href='#n1297'>1297</a>
<a id='n1298' href='#n1298'>1298</a>
<a id='n1299' href='#n1299'>1299</a>
<a id='n1300' href='#n1300'>1300</a>
<a id='n1301' href='#n1301'>1301</a>
<a id='n1302' href='#n1302'>1302</a>
<a id='n1303' href='#n1303'>1303</a>
<a id='n1304' href='#n1304'>1304</a>
<a id='n1305' href='#n1305'>1305</a>
<a id='n1306' href='#n1306'>1306</a>
<a id='n1307' href='#n1307'>1307</a>
<a id='n1308' href='#n1308'>1308</a>
<a id='n1309' href='#n1309'>1309</a>
<a id='n1310' href='#n1310'>1310</a>
<a id='n1311' href='#n1311'>1311</a>
<a id='n1312' href='#n1312'>1312</a>
<a id='n1313' href='#n1313'>1313</a>
<a id='n1314' href='#n1314'>1314</a>
<a id='n1315' href='#n1315'>1315</a>
<a id='n1316' href='#n1316'>1316</a>
<a id='n1317' href='#n1317'>1317</a>
<a id='n1318' href='#n1318'>1318</a>
<a id='n1319' href='#n1319'>1319</a>
<a id='n1320' href='#n1320'>1320</a>
<a id='n1321' href='#n1321'>1321</a>
<a id='n1322' href='#n1322'>1322</a>
<a id='n1323' href='#n1323'>1323</a>
<a id='n1324' href='#n1324'>1324</a>
<a id='n1325' href='#n1325'>1325</a>
<a id='n1326' href='#n1326'>1326</a>
<a id='n1327' href='#n1327'>1327</a>
<a id='n1328' href='#n1328'>1328</a>
<a id='n1329' href='#n1329'>1329</a>
<a id='n1330' href='#n1330'>1330</a>
<a id='n1331' href='#n1331'>1331</a>
<a id='n1332' href='#n1332'>1332</a>
<a id='n1333' href='#n1333'>1333</a>
<a id='n1334' href='#n1334'>1334</a>
<a id='n1335' href='#n1335'>1335</a>
<a id='n1336' href='#n1336'>1336</a>
<a id='n1337' href='#n1337'>1337</a>
<a id='n1338' href='#n1338'>1338</a>
<a id='n1339' href='#n1339'>1339</a>
<a id='n1340' href='#n1340'>1340</a>
<a id='n1341' href='#n1341'>1341</a>
<a id='n1342' href='#n1342'>1342</a>
<a id='n1343' href='#n1343'>1343</a>
<a id='n1344' href='#n1344'>1344</a>
<a id='n1345' href='#n1345'>1345</a>
<a id='n1346' href='#n1346'>1346</a>
<a id='n1347' href='#n1347'>1347</a>
<a id='n1348' href='#n1348'>1348</a>
<a id='n1349' href='#n1349'>1349</a>
<a id='n1350' href='#n1350'>1350</a>
<a id='n1351' href='#n1351'>1351</a>
<a id='n1352' href='#n1352'>1352</a>
<a id='n1353' href='#n1353'>1353</a>
<a id='n1354' href='#n1354'>1354</a>
<a id='n1355' href='#n1355'>1355</a>
<a id='n1356' href='#n1356'>1356</a>
<a id='n1357' href='#n1357'>1357</a>
<a id='n1358' href='#n1358'>1358</a>
<a id='n1359' href='#n1359'>1359</a>
<a id='n1360' href='#n1360'>1360</a>
<a id='n1361' href='#n1361'>1361</a>
<a id='n1362' href='#n1362'>1362</a>
<a id='n1363' href='#n1363'>1363</a>
<a id='n1364' href='#n1364'>1364</a>
<a id='n1365' href='#n1365'>1365</a>
<a id='n1366' href='#n1366'>1366</a>
<a id='n1367' href='#n1367'>1367</a>
<a id='n1368' href='#n1368'>1368</a>
<a id='n1369' href='#n1369'>1369</a>
<a id='n1370' href='#n1370'>1370</a>
<a id='n1371' href='#n1371'>1371</a>
<a id='n1372' href='#n1372'>1372</a>
<a id='n1373' href='#n1373'>1373</a>
<a id='n1374' href='#n1374'>1374</a>
<a id='n1375' href='#n1375'>1375</a>
<a id='n1376' href='#n1376'>1376</a>
<a id='n1377' href='#n1377'>1377</a>
<a id='n1378' href='#n1378'>1378</a>
<a id='n1379' href='#n1379'>1379</a>
<a id='n1380' href='#n1380'>1380</a>
<a id='n1381' href='#n1381'>1381</a>
<a id='n1382' href='#n1382'>1382</a>
<a id='n1383' href='#n1383'>1383</a>
<a id='n1384' href='#n1384'>1384</a>
<a id='n1385' href='#n1385'>1385</a>
<a id='n1386' href='#n1386'>1386</a>
<a id='n1387' href='#n1387'>1387</a>
<a id='n1388' href='#n1388'>1388</a>
<a id='n1389' href='#n1389'>1389</a>
<a id='n1390' href='#n1390'>1390</a>
<a id='n1391' href='#n1391'>1391</a>
<a id='n1392' href='#n1392'>1392</a>
<a id='n1393' href='#n1393'>1393</a>
<a id='n1394' href='#n1394'>1394</a>
<a id='n1395' href='#n1395'>1395</a>
<a id='n1396' href='#n1396'>1396</a>
<a id='n1397' href='#n1397'>1397</a>
<a id='n1398' href='#n1398'>1398</a>
<a id='n1399' href='#n1399'>1399</a>
<a id='n1400' href='#n1400'>1400</a>
<a id='n1401' href='#n1401'>1401</a>
<a id='n1402' href='#n1402'>1402</a>
<a id='n1403' href='#n1403'>1403</a>
<a id='n1404' href='#n1404'>1404</a>
<a id='n1405' href='#n1405'>1405</a>
<a id='n1406' href='#n1406'>1406</a>
<a id='n1407' href='#n1407'>1407</a>
<a id='n1408' href='#n1408'>1408</a>
<a id='n1409' href='#n1409'>1409</a>
<a id='n1410' href='#n1410'>1410</a>
<a id='n1411' href='#n1411'>1411</a>
<a id='n1412' href='#n1412'>1412</a>
<a id='n1413' href='#n1413'>1413</a>
<a id='n1414' href='#n1414'>1414</a>
<a id='n1415' href='#n1415'>1415</a>
<a id='n1416' href='#n1416'>1416</a>
<a id='n1417' href='#n1417'>1417</a>
<a id='n1418' href='#n1418'>1418</a>
<a id='n1419' href='#n1419'>1419</a>
<a id='n1420' href='#n1420'>1420</a>
<a id='n1421' href='#n1421'>1421</a>
<a id='n1422' href='#n1422'>1422</a>
<a id='n1423' href='#n1423'>1423</a>
<a id='n1424' href='#n1424'>1424</a>
<a id='n1425' href='#n1425'>1425</a>
<a id='n1426' href='#n1426'>1426</a>
<a id='n1427' href='#n1427'>1427</a>
<a id='n1428' href='#n1428'>1428</a>
<a id='n1429' href='#n1429'>1429</a>
<a id='n1430' href='#n1430'>1430</a>
<a id='n1431' href='#n1431'>1431</a>
<a id='n1432' href='#n1432'>1432</a>
<a id='n1433' href='#n1433'>1433</a>
<a id='n1434' href='#n1434'>1434</a>
<a id='n1435' href='#n1435'>1435</a>
<a id='n1436' href='#n1436'>1436</a>
<a id='n1437' href='#n1437'>1437</a>
<a id='n1438' href='#n1438'>1438</a>
<a id='n1439' href='#n1439'>1439</a>
<a id='n1440' href='#n1440'>1440</a>
<a id='n1441' href='#n1441'>1441</a>
<a id='n1442' href='#n1442'>1442</a>
<a id='n1443' href='#n1443'>1443</a>
<a id='n1444' href='#n1444'>1444</a>
<a id='n1445' href='#n1445'>1445</a>
<a id='n1446' href='#n1446'>1446</a>
<a id='n1447' href='#n1447'>1447</a>
<a id='n1448' href='#n1448'>1448</a>
<a id='n1449' href='#n1449'>1449</a>
<a id='n1450' href='#n1450'>1450</a>
<a id='n1451' href='#n1451'>1451</a>
<a id='n1452' href='#n1452'>1452</a>
<a id='n1453' href='#n1453'>1453</a>
<a id='n1454' href='#n1454'>1454</a>
<a id='n1455' href='#n1455'>1455</a>
<a id='n1456' href='#n1456'>1456</a>
<a id='n1457' href='#n1457'>1457</a>
<a id='n1458' href='#n1458'>1458</a>
<a id='n1459' href='#n1459'>1459</a>
<a id='n1460' href='#n1460'>1460</a>
<a id='n1461' href='#n1461'>1461</a>
<a id='n1462' href='#n1462'>1462</a>
<a id='n1463' href='#n1463'>1463</a>
<a id='n1464' href='#n1464'>1464</a>
<a id='n1465' href='#n1465'>1465</a>
<a id='n1466' href='#n1466'>1466</a>
<a id='n1467' href='#n1467'>1467</a>
<a id='n1468' href='#n1468'>1468</a>
<a id='n1469' href='#n1469'>1469</a>
<a id='n1470' href='#n1470'>1470</a>
<a id='n1471' href='#n1471'>1471</a>
<a id='n1472' href='#n1472'>1472</a>
<a id='n1473' href='#n1473'>1473</a>
<a id='n1474' href='#n1474'>1474</a>
<a id='n1475' href='#n1475'>1475</a>
<a id='n1476' href='#n1476'>1476</a>
<a id='n1477' href='#n1477'>1477</a>
<a id='n1478' href='#n1478'>1478</a>
<a id='n1479' href='#n1479'>1479</a>
<a id='n1480' href='#n1480'>1480</a>
<a id='n1481' href='#n1481'>1481</a>
<a id='n1482' href='#n1482'>1482</a>
<a id='n1483' href='#n1483'>1483</a>
<a id='n1484' href='#n1484'>1484</a>
<a id='n1485' href='#n1485'>1485</a>
<a id='n1486' href='#n1486'>1486</a>
<a id='n1487' href='#n1487'>1487</a>
<a id='n1488' href='#n1488'>1488</a>
<a id='n1489' href='#n1489'>1489</a>
<a id='n1490' href='#n1490'>1490</a>
<a id='n1491' href='#n1491'>1491</a>
<a id='n1492' href='#n1492'>1492</a>
<a id='n1493' href='#n1493'>1493</a>
<a id='n1494' href='#n1494'>1494</a>
<a id='n1495' href='#n1495'>1495</a>
<a id='n1496' href='#n1496'>1496</a>
<a id='n1497' href='#n1497'>1497</a>
<a id='n1498' href='#n1498'>1498</a>
<a id='n1499' href='#n1499'>1499</a>
<a id='n1500' href='#n1500'>1500</a>
<a id='n1501' href='#n1501'>1501</a>
<a id='n1502' href='#n1502'>1502</a>
<a id='n1503' href='#n1503'>1503</a>
<a id='n1504' href='#n1504'>1504</a>
<a id='n1505' href='#n1505'>1505</a>
<a id='n1506' href='#n1506'>1506</a>
<a id='n1507' href='#n1507'>1507</a>
<a id='n1508' href='#n1508'>1508</a>
<a id='n1509' href='#n1509'>1509</a>
<a id='n1510' href='#n1510'>1510</a>
<a id='n1511' href='#n1511'>1511</a>
<a id='n1512' href='#n1512'>1512</a>
<a id='n1513' href='#n1513'>1513</a>
<a id='n1514' href='#n1514'>1514</a>
<a id='n1515' href='#n1515'>1515</a>
<a id='n1516' href='#n1516'>1516</a>
<a id='n1517' href='#n1517'>1517</a>
<a id='n1518' href='#n1518'>1518</a>
<a id='n1519' href='#n1519'>1519</a>
<a id='n1520' href='#n1520'>1520</a>
<a id='n1521' href='#n1521'>1521</a>
<a id='n1522' href='#n1522'>1522</a>
<a id='n1523' href='#n1523'>1523</a>
<a id='n1524' href='#n1524'>1524</a>
<a id='n1525' href='#n1525'>1525</a>
<a id='n1526' href='#n1526'>1526</a>
<a id='n1527' href='#n1527'>1527</a>
<a id='n1528' href='#n1528'>1528</a>
<a id='n1529' href='#n1529'>1529</a>
<a id='n1530' href='#n1530'>1530</a>
<a id='n1531' href='#n1531'>1531</a>
<a id='n1532' href='#n1532'>1532</a>
<a id='n1533' href='#n1533'>1533</a>
<a id='n1534' href='#n1534'>1534</a>
<a id='n1535' href='#n1535'>1535</a>
<a id='n1536' href='#n1536'>1536</a>
<a id='n1537' href='#n1537'>1537</a>
<a id='n1538' href='#n1538'>1538</a>
<a id='n1539' href='#n1539'>1539</a>
<a id='n1540' href='#n1540'>1540</a>
<a id='n1541' href='#n1541'>1541</a>
<a id='n1542' href='#n1542'>1542</a>
<a id='n1543' href='#n1543'>1543</a>
<a id='n1544' href='#n1544'>1544</a>
<a id='n1545' href='#n1545'>1545</a>
<a id='n1546' href='#n1546'>1546</a>
<a id='n1547' href='#n1547'>1547</a>
<a id='n1548' href='#n1548'>1548</a>
<a id='n1549' href='#n1549'>1549</a>
<a id='n1550' href='#n1550'>1550</a>
<a id='n1551' href='#n1551'>1551</a>
<a id='n1552' href='#n1552'>1552</a>
<a id='n1553' href='#n1553'>1553</a>
<a id='n1554' href='#n1554'>1554</a>
<a id='n1555' href='#n1555'>1555</a>
<a id='n1556' href='#n1556'>1556</a>
<a id='n1557' href='#n1557'>1557</a>
<a id='n1558' href='#n1558'>1558</a>
<a id='n1559' href='#n1559'>1559</a>
<a id='n1560' href='#n1560'>1560</a>
<a id='n1561' href='#n1561'>1561</a>
<a id='n1562' href='#n1562'>1562</a>
<a id='n1563' href='#n1563'>1563</a>
<a id='n1564' href='#n1564'>1564</a>
<a id='n1565' href='#n1565'>1565</a>
<a id='n1566' href='#n1566'>1566</a>
<a id='n1567' href='#n1567'>1567</a>
<a id='n1568' href='#n1568'>1568</a>
<a id='n1569' href='#n1569'>1569</a>
<a id='n1570' href='#n1570'>1570</a>
<a id='n1571' href='#n1571'>1571</a>
<a id='n1572' href='#n1572'>1572</a>
<a id='n1573' href='#n1573'>1573</a>
<a id='n1574' href='#n1574'>1574</a>
<a id='n1575' href='#n1575'>1575</a>
<a id='n1576' href='#n1576'>1576</a>
<a id='n1577' href='#n1577'>1577</a>
<a id='n1578' href='#n1578'>1578</a>
<a id='n1579' href='#n1579'>1579</a>
<a id='n1580' href='#n1580'>1580</a>
<a id='n1581' href='#n1581'>1581</a>
<a id='n1582' href='#n1582'>1582</a>
<a id='n1583' href='#n1583'>1583</a>
<a id='n1584' href='#n1584'>1584</a>
<a id='n1585' href='#n1585'>1585</a>
<a id='n1586' href='#n1586'>1586</a>
<a id='n1587' href='#n1587'>1587</a>
<a id='n1588' href='#n1588'>1588</a>
<a id='n1589' href='#n1589'>1589</a>
<a id='n1590' href='#n1590'>1590</a>
<a id='n1591' href='#n1591'>1591</a>
<a id='n1592' href='#n1592'>1592</a>
<a id='n1593' href='#n1593'>1593</a>
<a id='n1594' href='#n1594'>1594</a>
<a id='n1595' href='#n1595'>1595</a>
<a id='n1596' href='#n1596'>1596</a>
<a id='n1597' href='#n1597'>1597</a>
<a id='n1598' href='#n1598'>1598</a>
<a id='n1599' href='#n1599'>1599</a>
<a id='n1600' href='#n1600'>1600</a>
<a id='n1601' href='#n1601'>1601</a>
<a id='n1602' href='#n1602'>1602</a>
<a id='n1603' href='#n1603'>1603</a>
<a id='n1604' href='#n1604'>1604</a>
<a id='n1605' href='#n1605'>1605</a>
<a id='n1606' href='#n1606'>1606</a>
<a id='n1607' href='#n1607'>1607</a>
<a id='n1608' href='#n1608'>1608</a>
<a id='n1609' href='#n1609'>1609</a>
<a id='n1610' href='#n1610'>1610</a>
<a id='n1611' href='#n1611'>1611</a>
<a id='n1612' href='#n1612'>1612</a>
<a id='n1613' href='#n1613'>1613</a>
<a id='n1614' href='#n1614'>1614</a>
<a id='n1615' href='#n1615'>1615</a>
<a id='n1616' href='#n1616'>1616</a>
<a id='n1617' href='#n1617'>1617</a>
<a id='n1618' href='#n1618'>1618</a>
<a id='n1619' href='#n1619'>1619</a>
<a id='n1620' href='#n1620'>1620</a>
<a id='n1621' href='#n1621'>1621</a>
<a id='n1622' href='#n1622'>1622</a>
<a id='n1623' href='#n1623'>1623</a>
<a id='n1624' href='#n1624'>1624</a>
<a id='n1625' href='#n1625'>1625</a>
<a id='n1626' href='#n1626'>1626</a>
<a id='n1627' href='#n1627'>1627</a>
<a id='n1628' href='#n1628'>1628</a>
<a id='n1629' href='#n1629'>1629</a>
<a id='n1630' href='#n1630'>1630</a>
<a id='n1631' href='#n1631'>1631</a>
<a id='n1632' href='#n1632'>1632</a>
<a id='n1633' href='#n1633'>1633</a>
<a id='n1634' href='#n1634'>1634</a>
<a id='n1635' href='#n1635'>1635</a>
<a id='n1636' href='#n1636'>1636</a>
<a id='n1637' href='#n1637'>1637</a>
<a id='n1638' href='#n1638'>1638</a>
<a id='n1639' href='#n1639'>1639</a>
<a id='n1640' href='#n1640'>1640</a>
<a id='n1641' href='#n1641'>1641</a>
<a id='n1642' href='#n1642'>1642</a>
<a id='n1643' href='#n1643'>1643</a>
<a id='n1644' href='#n1644'>1644</a>
<a id='n1645' href='#n1645'>1645</a>
<a id='n1646' href='#n1646'>1646</a>
<a id='n1647' href='#n1647'>1647</a>
<a id='n1648' href='#n1648'>1648</a>
<a id='n1649' href='#n1649'>1649</a>
<a id='n1650' href='#n1650'>1650</a>
<a id='n1651' href='#n1651'>1651</a>
<a id='n1652' href='#n1652'>1652</a>
<a id='n1653' href='#n1653'>1653</a>
<a id='n1654' href='#n1654'>1654</a>
<a id='n1655' href='#n1655'>1655</a>
<a id='n1656' href='#n1656'>1656</a>
<a id='n1657' href='#n1657'>1657</a>
<a id='n1658' href='#n1658'>1658</a>
<a id='n1659' href='#n1659'>1659</a>
<a id='n1660' href='#n1660'>1660</a>
<a id='n1661' href='#n1661'>1661</a>
<a id='n1662' href='#n1662'>1662</a>
<a id='n1663' href='#n1663'>1663</a>
<a id='n1664' href='#n1664'>1664</a>
<a id='n1665' href='#n1665'>1665</a>
<a id='n1666' href='#n1666'>1666</a>
<a id='n1667' href='#n1667'>1667</a>
<a id='n1668' href='#n1668'>1668</a>
<a id='n1669' href='#n1669'>1669</a>
<a id='n1670' href='#n1670'>1670</a>
<a id='n1671' href='#n1671'>1671</a>
<a id='n1672' href='#n1672'>1672</a>
<a id='n1673' href='#n1673'>1673</a>
<a id='n1674' href='#n1674'>1674</a>
<a id='n1675' href='#n1675'>1675</a>
<a id='n1676' href='#n1676'>1676</a>
<a id='n1677' href='#n1677'>1677</a>
<a id='n1678' href='#n1678'>1678</a>
<a id='n1679' href='#n1679'>1679</a>
<a id='n1680' href='#n1680'>1680</a>
<a id='n1681' href='#n1681'>1681</a>
<a id='n1682' href='#n1682'>1682</a>
<a id='n1683' href='#n1683'>1683</a>
<a id='n1684' href='#n1684'>1684</a>
<a id='n1685' href='#n1685'>1685</a>
<a id='n1686' href='#n1686'>1686</a>
<a id='n1687' href='#n1687'>1687</a>
<a id='n1688' href='#n1688'>1688</a>
<a id='n1689' href='#n1689'>1689</a>
<a id='n1690' href='#n1690'>1690</a>
<a id='n1691' href='#n1691'>1691</a>
<a id='n1692' href='#n1692'>1692</a>
<a id='n1693' href='#n1693'>1693</a>
<a id='n1694' href='#n1694'>1694</a>
<a id='n1695' href='#n1695'>1695</a>
<a id='n1696' href='#n1696'>1696</a>
<a id='n1697' href='#n1697'>1697</a>
<a id='n1698' href='#n1698'>1698</a>
<a id='n1699' href='#n1699'>1699</a>
<a id='n1700' href='#n1700'>1700</a>
<a id='n1701' href='#n1701'>1701</a>
<a id='n1702' href='#n1702'>1702</a>
<a id='n1703' href='#n1703'>1703</a>
<a id='n1704' href='#n1704'>1704</a>
<a id='n1705' href='#n1705'>1705</a>
<a id='n1706' href='#n1706'>1706</a>
<a id='n1707' href='#n1707'>1707</a>
<a id='n1708' href='#n1708'>1708</a>
<a id='n1709' href='#n1709'>1709</a>
<a id='n1710' href='#n1710'>1710</a>
<a id='n1711' href='#n1711'>1711</a>
<a id='n1712' href='#n1712'>1712</a>
<a id='n1713' href='#n1713'>1713</a>
<a id='n1714' href='#n1714'>1714</a>
<a id='n1715' href='#n1715'>1715</a>
<a id='n1716' href='#n1716'>1716</a>
<a id='n1717' href='#n1717'>1717</a>
<a id='n1718' href='#n1718'>1718</a>
<a id='n1719' href='#n1719'>1719</a>
<a id='n1720' href='#n1720'>1720</a>
<a id='n1721' href='#n1721'>1721</a>
<a id='n1722' href='#n1722'>1722</a>
<a id='n1723' href='#n1723'>1723</a>
<a id='n1724' href='#n1724'>1724</a>
<a id='n1725' href='#n1725'>1725</a>
<a id='n1726' href='#n1726'>1726</a>
<a id='n1727' href='#n1727'>1727</a>
<a id='n1728' href='#n1728'>1728</a>
<a id='n1729' href='#n1729'>1729</a>
<a id='n1730' href='#n1730'>1730</a>
<a id='n1731' href='#n1731'>1731</a>
<a id='n1732' href='#n1732'>1732</a>
<a id='n1733' href='#n1733'>1733</a>
<a id='n1734' href='#n1734'>1734</a>
<a id='n1735' href='#n1735'>1735</a>
<a id='n1736' href='#n1736'>1736</a>
<a id='n1737' href='#n1737'>1737</a>
<a id='n1738' href='#n1738'>1738</a>
<a id='n1739' href='#n1739'>1739</a>
<a id='n1740' href='#n1740'>1740</a>
<a id='n1741' href='#n1741'>1741</a>
<a id='n1742' href='#n1742'>1742</a>
<a id='n1743' href='#n1743'>1743</a>
<a id='n1744' href='#n1744'>1744</a>
<a id='n1745' href='#n1745'>1745</a>
<a id='n1746' href='#n1746'>1746</a>
<a id='n1747' href='#n1747'>1747</a>
<a id='n1748' href='#n1748'>1748</a>
<a id='n1749' href='#n1749'>1749</a>
<a id='n1750' href='#n1750'>1750</a>
<a id='n1751' href='#n1751'>1751</a>
<a id='n1752' href='#n1752'>1752</a>
<a id='n1753' href='#n1753'>1753</a>
<a id='n1754' href='#n1754'>1754</a>
<a id='n1755' href='#n1755'>1755</a>
<a id='n1756' href='#n1756'>1756</a>
<a id='n1757' href='#n1757'>1757</a>
<a id='n1758' href='#n1758'>1758</a>
<a id='n1759' href='#n1759'>1759</a>
<a id='n1760' href='#n1760'>1760</a>
<a id='n1761' href='#n1761'>1761</a>
<a id='n1762' href='#n1762'>1762</a>
<a id='n1763' href='#n1763'>1763</a>
<a id='n1764' href='#n1764'>1764</a>
<a id='n1765' href='#n1765'>1765</a>
<a id='n1766' href='#n1766'>1766</a>
<a id='n1767' href='#n1767'>1767</a>
<a id='n1768' href='#n1768'>1768</a>
<a id='n1769' href='#n1769'>1769</a>
<a id='n1770' href='#n1770'>1770</a>
<a id='n1771' href='#n1771'>1771</a>
<a id='n1772' href='#n1772'>1772</a>
<a id='n1773' href='#n1773'>1773</a>
<a id='n1774' href='#n1774'>1774</a>
<a id='n1775' href='#n1775'>1775</a>
<a id='n1776' href='#n1776'>1776</a>
<a id='n1777' href='#n1777'>1777</a>
<a id='n1778' href='#n1778'>1778</a>
<a id='n1779' href='#n1779'>1779</a>
<a id='n1780' href='#n1780'>1780</a>
<a id='n1781' href='#n1781'>1781</a>
<a id='n1782' href='#n1782'>1782</a>
<a id='n1783' href='#n1783'>1783</a>
<a id='n1784' href='#n1784'>1784</a>
<a id='n1785' href='#n1785'>1785</a>
<a id='n1786' href='#n1786'>1786</a>
<a id='n1787' href='#n1787'>1787</a>
<a id='n1788' href='#n1788'>1788</a>
<a id='n1789' href='#n1789'>1789</a>
<a id='n1790' href='#n1790'>1790</a>
<a id='n1791' href='#n1791'>1791</a>
<a id='n1792' href='#n1792'>1792</a>
<a id='n1793' href='#n1793'>1793</a>
<a id='n1794' href='#n1794'>1794</a>
<a id='n1795' href='#n1795'>1795</a>
<a id='n1796' href='#n1796'>1796</a>
<a id='n1797' href='#n1797'>1797</a>
<a id='n1798' href='#n1798'>1798</a>
<a id='n1799' href='#n1799'>1799</a>
<a id='n1800' href='#n1800'>1800</a>
<a id='n1801' href='#n1801'>1801</a>
<a id='n1802' href='#n1802'>1802</a>
<a id='n1803' href='#n1803'>1803</a>
<a id='n1804' href='#n1804'>1804</a>
<a id='n1805' href='#n1805'>1805</a>
<a id='n1806' href='#n1806'>1806</a>
<a id='n1807' href='#n1807'>1807</a>
<a id='n1808' href='#n1808'>1808</a>
<a id='n1809' href='#n1809'>1809</a>
<a id='n1810' href='#n1810'>1810</a>
<a id='n1811' href='#n1811'>1811</a>
<a id='n1812' href='#n1812'>1812</a>
<a id='n1813' href='#n1813'>1813</a>
<a id='n1814' href='#n1814'>1814</a>
<a id='n1815' href='#n1815'>1815</a>
<a id='n1816' href='#n1816'>1816</a>
<a id='n1817' href='#n1817'>1817</a>
<a id='n1818' href='#n1818'>1818</a>
<a id='n1819' href='#n1819'>1819</a>
<a id='n1820' href='#n1820'>1820</a>
<a id='n1821' href='#n1821'>1821</a>
<a id='n1822' href='#n1822'>1822</a>
<a id='n1823' href='#n1823'>1823</a>
<a id='n1824' href='#n1824'>1824</a>
<a id='n1825' href='#n1825'>1825</a>
<a id='n1826' href='#n1826'>1826</a>
<a id='n1827' href='#n1827'>1827</a>
<a id='n1828' href='#n1828'>1828</a>
<a id='n1829' href='#n1829'>1829</a>
<a id='n1830' href='#n1830'>1830</a>
<a id='n1831' href='#n1831'>1831</a>
<a id='n1832' href='#n1832'>1832</a>
<a id='n1833' href='#n1833'>1833</a>
<a id='n1834' href='#n1834'>1834</a>
<a id='n1835' href='#n1835'>1835</a>
<a id='n1836' href='#n1836'>1836</a>
<a id='n1837' href='#n1837'>1837</a>
<a id='n1838' href='#n1838'>1838</a>
<a id='n1839' href='#n1839'>1839</a>
<a id='n1840' href='#n1840'>1840</a>
<a id='n1841' href='#n1841'>1841</a>
<a id='n1842' href='#n1842'>1842</a>
<a id='n1843' href='#n1843'>1843</a>
<a id='n1844' href='#n1844'>1844</a>
<a id='n1845' href='#n1845'>1845</a>
<a id='n1846' href='#n1846'>1846</a>
<a id='n1847' href='#n1847'>1847</a>
<a id='n1848' href='#n1848'>1848</a>
<a id='n1849' href='#n1849'>1849</a>
<a id='n1850' href='#n1850'>1850</a>
<a id='n1851' href='#n1851'>1851</a>
<a id='n1852' href='#n1852'>1852</a>
<a id='n1853' href='#n1853'>1853</a>
<a id='n1854' href='#n1854'>1854</a>
<a id='n1855' href='#n1855'>1855</a>
<a id='n1856' href='#n1856'>1856</a>
<a id='n1857' href='#n1857'>1857</a>
<a id='n1858' href='#n1858'>1858</a>
<a id='n1859' href='#n1859'>1859</a>
<a id='n1860' href='#n1860'>1860</a>
<a id='n1861' href='#n1861'>1861</a>
<a id='n1862' href='#n1862'>1862</a>
<a id='n1863' href='#n1863'>1863</a>
<a id='n1864' href='#n1864'>1864</a>
<a id='n1865' href='#n1865'>1865</a>
<a id='n1866' href='#n1866'>1866</a>
<a id='n1867' href='#n1867'>1867</a>
<a id='n1868' href='#n1868'>1868</a>
<a id='n1869' href='#n1869'>1869</a>
<a id='n1870' href='#n1870'>1870</a>
<a id='n1871' href='#n1871'>1871</a>
<a id='n1872' href='#n1872'>1872</a>
<a id='n1873' href='#n1873'>1873</a>
<a id='n1874' href='#n1874'>1874</a>
<a id='n1875' href='#n1875'>1875</a>
<a id='n1876' href='#n1876'>1876</a>
<a id='n1877' href='#n1877'>1877</a>
<a id='n1878' href='#n1878'>1878</a>
<a id='n1879' href='#n1879'>1879</a>
<a id='n1880' href='#n1880'>1880</a>
<a id='n1881' href='#n1881'>1881</a>
<a id='n1882' href='#n1882'>1882</a>
<a id='n1883' href='#n1883'>1883</a>
<a id='n1884' href='#n1884'>1884</a>
<a id='n1885' href='#n1885'>1885</a>
<a id='n1886' href='#n1886'>1886</a>
<a id='n1887' href='#n1887'>1887</a>
<a id='n1888' href='#n1888'>1888</a>
<a id='n1889' href='#n1889'>1889</a>
<a id='n1890' href='#n1890'>1890</a>
<a id='n1891' href='#n1891'>1891</a>
<a id='n1892' href='#n1892'>1892</a>
<a id='n1893' href='#n1893'>1893</a>
<a id='n1894' href='#n1894'>1894</a>
<a id='n1895' href='#n1895'>1895</a>
<a id='n1896' href='#n1896'>1896</a>
<a id='n1897' href='#n1897'>1897</a>
<a id='n1898' href='#n1898'>1898</a>
<a id='n1899' href='#n1899'>1899</a>
<a id='n1900' href='#n1900'>1900</a>
<a id='n1901' href='#n1901'>1901</a>
<a id='n1902' href='#n1902'>1902</a>
<a id='n1903' href='#n1903'>1903</a>
<a id='n1904' href='#n1904'>1904</a>
<a id='n1905' href='#n1905'>1905</a>
<a id='n1906' href='#n1906'>1906</a>
<a id='n1907' href='#n1907'>1907</a>
<a id='n1908' href='#n1908'>1908</a>
<a id='n1909' href='#n1909'>1909</a>
<a id='n1910' href='#n1910'>1910</a>
<a id='n1911' href='#n1911'>1911</a>
<a id='n1912' href='#n1912'>1912</a>
<a id='n1913' href='#n1913'>1913</a>
<a id='n1914' href='#n1914'>1914</a>
<a id='n1915' href='#n1915'>1915</a>
<a id='n1916' href='#n1916'>1916</a>
<a id='n1917' href='#n1917'>1917</a>
<a id='n1918' href='#n1918'>1918</a>
<a id='n1919' href='#n1919'>1919</a>
<a id='n1920' href='#n1920'>1920</a>
<a id='n1921' href='#n1921'>1921</a>
<a id='n1922' href='#n1922'>1922</a>
<a id='n1923' href='#n1923'>1923</a>
<a id='n1924' href='#n1924'>1924</a>
<a id='n1925' href='#n1925'>1925</a>
<a id='n1926' href='#n1926'>1926</a>
<a id='n1927' href='#n1927'>1927</a>
<a id='n1928' href='#n1928'>1928</a>
<a id='n1929' href='#n1929'>1929</a>
<a id='n1930' href='#n1930'>1930</a>
<a id='n1931' href='#n1931'>1931</a>
<a id='n1932' href='#n1932'>1932</a>
<a id='n1933' href='#n1933'>1933</a>
<a id='n1934' href='#n1934'>1934</a>
<a id='n1935' href='#n1935'>1935</a>
<a id='n1936' href='#n1936'>1936</a>
<a id='n1937' href='#n1937'>1937</a>
<a id='n1938' href='#n1938'>1938</a>
<a id='n1939' href='#n1939'>1939</a>
<a id='n1940' href='#n1940'>1940</a>
<a id='n1941' href='#n1941'>1941</a>
<a id='n1942' href='#n1942'>1942</a>
<a id='n1943' href='#n1943'>1943</a>
<a id='n1944' href='#n1944'>1944</a>
<a id='n1945' href='#n1945'>1945</a>
<a id='n1946' href='#n1946'>1946</a>
<a id='n1947' href='#n1947'>1947</a>
<a id='n1948' href='#n1948'>1948</a>
<a id='n1949' href='#n1949'>1949</a>
<a id='n1950' href='#n1950'>1950</a>
<a id='n1951' href='#n1951'>1951</a>
<a id='n1952' href='#n1952'>1952</a>
<a id='n1953' href='#n1953'>1953</a>
<a id='n1954' href='#n1954'>1954</a>
<a id='n1955' href='#n1955'>1955</a>
<a id='n1956' href='#n1956'>1956</a>
<a id='n1957' href='#n1957'>1957</a>
<a id='n1958' href='#n1958'>1958</a>
<a id='n1959' href='#n1959'>1959</a>
<a id='n1960' href='#n1960'>1960</a>
<a id='n1961' href='#n1961'>1961</a>
<a id='n1962' href='#n1962'>1962</a>
<a id='n1963' href='#n1963'>1963</a>
<a id='n1964' href='#n1964'>1964</a>
<a id='n1965' href='#n1965'>1965</a>
<a id='n1966' href='#n1966'>1966</a>
<a id='n1967' href='#n1967'>1967</a>
<a id='n1968' href='#n1968'>1968</a>
<a id='n1969' href='#n1969'>1969</a>
<a id='n1970' href='#n1970'>1970</a>
<a id='n1971' href='#n1971'>1971</a>
<a id='n1972' href='#n1972'>1972</a>
<a id='n1973' href='#n1973'>1973</a>
<a id='n1974' href='#n1974'>1974</a>
<a id='n1975' href='#n1975'>1975</a>
<a id='n1976' href='#n1976'>1976</a>
<a id='n1977' href='#n1977'>1977</a>
<a id='n1978' href='#n1978'>1978</a>
<a id='n1979' href='#n1979'>1979</a>
<a id='n1980' href='#n1980'>1980</a>
<a id='n1981' href='#n1981'>1981</a>
<a id='n1982' href='#n1982'>1982</a>
<a id='n1983' href='#n1983'>1983</a>
<a id='n1984' href='#n1984'>1984</a>
<a id='n1985' href='#n1985'>1985</a>
<a id='n1986' href='#n1986'>1986</a>
<a id='n1987' href='#n1987'>1987</a>
<a id='n1988' href='#n1988'>1988</a>
<a id='n1989' href='#n1989'>1989</a>
<a id='n1990' href='#n1990'>1990</a>
<a id='n1991' href='#n1991'>1991</a>
<a id='n1992' href='#n1992'>1992</a>
<a id='n1993' href='#n1993'>1993</a>
<a id='n1994' href='#n1994'>1994</a>
<a id='n1995' href='#n1995'>1995</a>
<a id='n1996' href='#n1996'>1996</a>
<a id='n1997' href='#n1997'>1997</a>
<a id='n1998' href='#n1998'>1998</a>
<a id='n1999' href='#n1999'>1999</a>
<a id='n2000' href='#n2000'>2000</a>
<a id='n2001' href='#n2001'>2001</a>
<a id='n2002' href='#n2002'>2002</a>
<a id='n2003' href='#n2003'>2003</a>
<a id='n2004' href='#n2004'>2004</a>
<a id='n2005' href='#n2005'>2005</a>
<a id='n2006' href='#n2006'>2006</a>
<a id='n2007' href='#n2007'>2007</a>
<a id='n2008' href='#n2008'>2008</a>
<a id='n2009' href='#n2009'>2009</a>
<a id='n2010' href='#n2010'>2010</a>
<a id='n2011' href='#n2011'>2011</a>
<a id='n2012' href='#n2012'>2012</a>
<a id='n2013' href='#n2013'>2013</a>
<a id='n2014' href='#n2014'>2014</a>
<a id='n2015' href='#n2015'>2015</a>
<a id='n2016' href='#n2016'>2016</a>
<a id='n2017' href='#n2017'>2017</a>
<a id='n2018' href='#n2018'>2018</a>
<a id='n2019' href='#n2019'>2019</a>
<a id='n2020' href='#n2020'>2020</a>
<a id='n2021' href='#n2021'>2021</a>
<a id='n2022' href='#n2022'>2022</a>
<a id='n2023' href='#n2023'>2023</a>
<a id='n2024' href='#n2024'>2024</a>
<a id='n2025' href='#n2025'>2025</a>
<a id='n2026' href='#n2026'>2026</a>
<a id='n2027' href='#n2027'>2027</a>
<a id='n2028' href='#n2028'>2028</a>
<a id='n2029' href='#n2029'>2029</a>
<a id='n2030' href='#n2030'>2030</a>
<a id='n2031' href='#n2031'>2031</a>
<a id='n2032' href='#n2032'>2032</a>
<a id='n2033' href='#n2033'>2033</a>
<a id='n2034' href='#n2034'>2034</a>
<a id='n2035' href='#n2035'>2035</a>
<a id='n2036' href='#n2036'>2036</a>
<a id='n2037' href='#n2037'>2037</a>
<a id='n2038' href='#n2038'>2038</a>
<a id='n2039' href='#n2039'>2039</a>
<a id='n2040' href='#n2040'>2040</a>
<a id='n2041' href='#n2041'>2041</a>
<a id='n2042' href='#n2042'>2042</a>
<a id='n2043' href='#n2043'>2043</a>
<a id='n2044' href='#n2044'>2044</a>
<a id='n2045' href='#n2045'>2045</a>
<a id='n2046' href='#n2046'>2046</a>
<a id='n2047' href='#n2047'>2047</a>
<a id='n2048' href='#n2048'>2048</a>
<a id='n2049' href='#n2049'>2049</a>
<a id='n2050' href='#n2050'>2050</a>
<a id='n2051' href='#n2051'>2051</a>
<a id='n2052' href='#n2052'>2052</a>
<a id='n2053' href='#n2053'>2053</a>
<a id='n2054' href='#n2054'>2054</a>
<a id='n2055' href='#n2055'>2055</a>
<a id='n2056' href='#n2056'>2056</a>
<a id='n2057' href='#n2057'>2057</a>
<a id='n2058' href='#n2058'>2058</a>
<a id='n2059' href='#n2059'>2059</a>
<a id='n2060' href='#n2060'>2060</a>
<a id='n2061' href='#n2061'>2061</a>
<a id='n2062' href='#n2062'>2062</a>
<a id='n2063' href='#n2063'>2063</a>
<a id='n2064' href='#n2064'>2064</a>
<a id='n2065' href='#n2065'>2065</a>
<a id='n2066' href='#n2066'>2066</a>
<a id='n2067' href='#n2067'>2067</a>
<a id='n2068' href='#n2068'>2068</a>
<a id='n2069' href='#n2069'>2069</a>
<a id='n2070' href='#n2070'>2070</a>
<a id='n2071' href='#n2071'>2071</a>
<a id='n2072' href='#n2072'>2072</a>
<a id='n2073' href='#n2073'>2073</a>
<a id='n2074' href='#n2074'>2074</a>
<a id='n2075' href='#n2075'>2075</a>
<a id='n2076' href='#n2076'>2076</a>
<a id='n2077' href='#n2077'>2077</a>
<a id='n2078' href='#n2078'>2078</a>
<a id='n2079' href='#n2079'>2079</a>
<a id='n2080' href='#n2080'>2080</a>
<a id='n2081' href='#n2081'>2081</a>
<a id='n2082' href='#n2082'>2082</a>
<a id='n2083' href='#n2083'>2083</a>
<a id='n2084' href='#n2084'>2084</a>
<a id='n2085' href='#n2085'>2085</a>
<a id='n2086' href='#n2086'>2086</a>
<a id='n2087' href='#n2087'>2087</a>
<a id='n2088' href='#n2088'>2088</a>
<a id='n2089' href='#n2089'>2089</a>
<a id='n2090' href='#n2090'>2090</a>
<a id='n2091' href='#n2091'>2091</a>
<a id='n2092' href='#n2092'>2092</a>
<a id='n2093' href='#n2093'>2093</a>
<a id='n2094' href='#n2094'>2094</a>
<a id='n2095' href='#n2095'>2095</a>
<a id='n2096' href='#n2096'>2096</a>
<a id='n2097' href='#n2097'>2097</a>
<a id='n2098' href='#n2098'>2098</a>
<a id='n2099' href='#n2099'>2099</a>
<a id='n2100' href='#n2100'>2100</a>
<a id='n2101' href='#n2101'>2101</a>
<a id='n2102' href='#n2102'>2102</a>
<a id='n2103' href='#n2103'>2103</a>
<a id='n2104' href='#n2104'>2104</a>
<a id='n2105' href='#n2105'>2105</a>
<a id='n2106' href='#n2106'>2106</a>
<a id='n2107' href='#n2107'>2107</a>
<a id='n2108' href='#n2108'>2108</a>
<a id='n2109' href='#n2109'>2109</a>
<a id='n2110' href='#n2110'>2110</a>
<a id='n2111' href='#n2111'>2111</a>
<a id='n2112' href='#n2112'>2112</a>
<a id='n2113' href='#n2113'>2113</a>
<a id='n2114' href='#n2114'>2114</a>
<a id='n2115' href='#n2115'>2115</a>
<a id='n2116' href='#n2116'>2116</a>
<a id='n2117' href='#n2117'>2117</a>
<a id='n2118' href='#n2118'>2118</a>
<a id='n2119' href='#n2119'>2119</a>
<a id='n2120' href='#n2120'>2120</a>
<a id='n2121' href='#n2121'>2121</a>
<a id='n2122' href='#n2122'>2122</a>
<a id='n2123' href='#n2123'>2123</a>
<a id='n2124' href='#n2124'>2124</a>
<a id='n2125' href='#n2125'>2125</a>
<a id='n2126' href='#n2126'>2126</a>
<a id='n2127' href='#n2127'>2127</a>
<a id='n2128' href='#n2128'>2128</a>
<a id='n2129' href='#n2129'>2129</a>
<a id='n2130' href='#n2130'>2130</a>
<a id='n2131' href='#n2131'>2131</a>
<a id='n2132' href='#n2132'>2132</a>
<a id='n2133' href='#n2133'>2133</a>
<a id='n2134' href='#n2134'>2134</a>
<a id='n2135' href='#n2135'>2135</a>
<a id='n2136' href='#n2136'>2136</a>
<a id='n2137' href='#n2137'>2137</a>
<a id='n2138' href='#n2138'>2138</a>
<a id='n2139' href='#n2139'>2139</a>
<a id='n2140' href='#n2140'>2140</a>
<a id='n2141' href='#n2141'>2141</a>
<a id='n2142' href='#n2142'>2142</a>
<a id='n2143' href='#n2143'>2143</a>
<a id='n2144' href='#n2144'>2144</a>
<a id='n2145' href='#n2145'>2145</a>
<a id='n2146' href='#n2146'>2146</a>
<a id='n2147' href='#n2147'>2147</a>
<a id='n2148' href='#n2148'>2148</a>
<a id='n2149' href='#n2149'>2149</a>
<a id='n2150' href='#n2150'>2150</a>
<a id='n2151' href='#n2151'>2151</a>
<a id='n2152' href='#n2152'>2152</a>
<a id='n2153' href='#n2153'>2153</a>
<a id='n2154' href='#n2154'>2154</a>
<a id='n2155' href='#n2155'>2155</a>
<a id='n2156' href='#n2156'>2156</a>
<a id='n2157' href='#n2157'>2157</a>
<a id='n2158' href='#n2158'>2158</a>
<a id='n2159' href='#n2159'>2159</a>
<a id='n2160' href='#n2160'>2160</a>
<a id='n2161' href='#n2161'>2161</a>
<a id='n2162' href='#n2162'>2162</a>
<a id='n2163' href='#n2163'>2163</a>
<a id='n2164' href='#n2164'>2164</a>
<a id='n2165' href='#n2165'>2165</a>
<a id='n2166' href='#n2166'>2166</a>
<a id='n2167' href='#n2167'>2167</a>
<a id='n2168' href='#n2168'>2168</a>
<a id='n2169' href='#n2169'>2169</a>
<a id='n2170' href='#n2170'>2170</a>
<a id='n2171' href='#n2171'>2171</a>
<a id='n2172' href='#n2172'>2172</a>
<a id='n2173' href='#n2173'>2173</a>
<a id='n2174' href='#n2174'>2174</a>
<a id='n2175' href='#n2175'>2175</a>
<a id='n2176' href='#n2176'>2176</a>
<a id='n2177' href='#n2177'>2177</a>
<a id='n2178' href='#n2178'>2178</a>
<a id='n2179' href='#n2179'>2179</a>
<a id='n2180' href='#n2180'>2180</a>
<a id='n2181' href='#n2181'>2181</a>
<a id='n2182' href='#n2182'>2182</a>
<a id='n2183' href='#n2183'>2183</a>
<a id='n2184' href='#n2184'>2184</a>
<a id='n2185' href='#n2185'>2185</a>
<a id='n2186' href='#n2186'>2186</a>
<a id='n2187' href='#n2187'>2187</a>
<a id='n2188' href='#n2188'>2188</a>
<a id='n2189' href='#n2189'>2189</a>
<a id='n2190' href='#n2190'>2190</a>
<a id='n2191' href='#n2191'>2191</a>
<a id='n2192' href='#n2192'>2192</a>
<a id='n2193' href='#n2193'>2193</a>
<a id='n2194' href='#n2194'>2194</a>
<a id='n2195' href='#n2195'>2195</a>
<a id='n2196' href='#n2196'>2196</a>
<a id='n2197' href='#n2197'>2197</a>
<a id='n2198' href='#n2198'>2198</a>
<a id='n2199' href='#n2199'>2199</a>
<a id='n2200' href='#n2200'>2200</a>
<a id='n2201' href='#n2201'>2201</a>
<a id='n2202' href='#n2202'>2202</a>
<a id='n2203' href='#n2203'>2203</a>
<a id='n2204' href='#n2204'>2204</a>
<a id='n2205' href='#n2205'>2205</a>
<a id='n2206' href='#n2206'>2206</a>
<a id='n2207' href='#n2207'>2207</a>
<a id='n2208' href='#n2208'>2208</a>
<a id='n2209' href='#n2209'>2209</a>
<a id='n2210' href='#n2210'>2210</a>
<a id='n2211' href='#n2211'>2211</a>
<a id='n2212' href='#n2212'>2212</a>
<a id='n2213' href='#n2213'>2213</a>
<a id='n2214' href='#n2214'>2214</a>
<a id='n2215' href='#n2215'>2215</a>
<a id='n2216' href='#n2216'>2216</a>
<a id='n2217' href='#n2217'>2217</a>
<a id='n2218' href='#n2218'>2218</a>
<a id='n2219' href='#n2219'>2219</a>
<a id='n2220' href='#n2220'>2220</a>
<a id='n2221' href='#n2221'>2221</a>
<a id='n2222' href='#n2222'>2222</a>
<a id='n2223' href='#n2223'>2223</a>
</pre></td>
<td class='lines'><pre><code><style>pre { line-height: 125%; }
td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span></span><span class="cm">/*</span>
<span class="cm"> * Copyright (C) 2010, Stefan Lay &lt;stefan.lay@sap.com&gt;</span>
<span class="cm"> * Copyright (C) 2010-2014, Christian Halstrick &lt;christian.halstrick@sap.com&gt; and others</span>
<span class="cm"> *</span>
<span class="cm"> * This program and the accompanying materials are made available under the</span>
<span class="cm"> * terms of the Eclipse Distribution License v. 1.0 which is available at</span>
<span class="cm"> * https://www.eclipse.org/org/documents/edl-v10.php.</span>
<span class="cm"> *</span>
<span class="cm"> * SPDX-License-Identifier: BSD-3-Clause</span>
<span class="cm"> */</span>
<span class="kn">package</span><span class="w"> </span><span class="nn">org.eclipse.jgit.api</span><span class="p">;</span>

<span class="kn">import static</span><span class="w"> </span><span class="nn">org.eclipse.jgit.lib.Constants.MASTER</span><span class="p">;</span>
<span class="kn">import static</span><span class="w"> </span><span class="nn">org.eclipse.jgit.lib.Constants.R_HEADS</span><span class="p">;</span>
<span class="kn">import static</span><span class="w"> </span><span class="nn">org.junit.Assert.assertEquals</span><span class="p">;</span>
<span class="kn">import static</span><span class="w"> </span><span class="nn">org.junit.Assert.assertFalse</span><span class="p">;</span>
<span class="kn">import static</span><span class="w"> </span><span class="nn">org.junit.Assert.assertNotNull</span><span class="p">;</span>
<span class="kn">import static</span><span class="w"> </span><span class="nn">org.junit.Assert.assertNull</span><span class="p">;</span>
<span class="kn">import static</span><span class="w"> </span><span class="nn">org.junit.Assert.assertTrue</span><span class="p">;</span>
<span class="kn">import static</span><span class="w"> </span><span class="nn">org.junit.Assert.fail</span><span class="p">;</span>
<span class="kn">import static</span><span class="w"> </span><span class="nn">org.junit.Assume.assumeTrue</span><span class="p">;</span>

<span class="kn">import</span><span class="w"> </span><span class="nn">java.io.File</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">java.nio.file.DirectoryStream</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">java.nio.file.Files</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">java.nio.file.Path</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">java.util.Iterator</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">java.util.regex.Pattern</span><span class="p">;</span>

<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.api.MergeCommand.FastForwardMode</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.api.MergeResult.MergeStatus</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.api.ResetCommand.ResetType</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.api.errors.InvalidMergeHeadsException</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.junit.RepositoryTestCase</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.junit.TestRepository</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.junit.TestRepository.BranchBuilder</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.lib.Constants</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.lib.Ref</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.lib.RefDatabase</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.lib.Repository</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.lib.RepositoryState</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.lib.Sets</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.lib.StoredConfig</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.merge.ContentMergeStrategy</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.merge.MergeStrategy</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.revwalk.RevCommit</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.util.FS</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.util.FileUtils</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.util.GitDateFormatter</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.eclipse.jgit.util.GitDateFormatter.Format</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.junit.Assume</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.junit.Before</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.junit.Test</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.junit.experimental.theories.DataPoints</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.junit.experimental.theories.Theories</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.junit.experimental.theories.Theory</span><span class="p">;</span>
<span class="kn">import</span><span class="w"> </span><span class="nn">org.junit.runner.RunWith</span><span class="p">;</span>

<span class="nd">@RunWith</span><span class="p">(</span><span class="n">Theories</span><span class="p">.</span><span class="na">class</span><span class="p">)</span>
<span class="kd">public</span><span class="w"> </span><span class="kd">class</span> <span class="nc">MergeCommandTest</span><span class="w"> </span><span class="kd">extends</span><span class="w"> </span><span class="n">RepositoryTestCase</span><span class="w"> </span><span class="p">{</span>

<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kd">static</span><span class="w"> </span><span class="nd">@DataPoints</span>
<span class="w">	</span><span class="n">MergeStrategy</span><span class="o">[]</span><span class="w"> </span><span class="n">mergeStrategies</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">get</span><span class="p">();</span>

<span class="w">	</span><span class="kd">private</span><span class="w"> </span><span class="n">GitDateFormatter</span><span class="w"> </span><span class="n">dateFormatter</span><span class="p">;</span>

<span class="w">	</span><span class="nd">@Override</span>
<span class="w">	</span><span class="nd">@Before</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">setUp</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="kd">super</span><span class="p">.</span><span class="na">setUp</span><span class="p">();</span>
<span class="w">		</span><span class="n">dateFormatter</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">GitDateFormatter</span><span class="p">(</span><span class="n">Format</span><span class="p">.</span><span class="na">DEFAULT</span><span class="p">);</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeInItself</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">)).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">ALREADY_UP_TO_DATE</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">		</span><span class="c1">// no reflog entry written by merge</span>
<span class="w">		</span><span class="n">RefDatabase</span><span class="w"> </span><span class="n">refDb</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRefDatabase</span><span class="p">();</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;commit (initial): initial commit&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">refDb</span>
<span class="w">				</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">).</span><span class="na">getLastEntry</span><span class="p">().</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;commit (initial): initial commit&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">refDb</span>
<span class="w">				</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getFullBranch</span><span class="p">()).</span><span class="na">getLastEntry</span><span class="p">()</span>
<span class="w">				</span><span class="p">.</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testAlreadyUpToDate</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">second</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">)).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">ALREADY_UP_TO_DATE</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">second</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">		</span><span class="c1">// no reflog entry written by merge</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;commit: second commit&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRefDatabase</span><span class="p">()</span>
<span class="w">				</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">).</span><span class="na">getLastEntry</span><span class="p">().</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;commit: second commit&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRefDatabase</span><span class="p">()</span>
<span class="w">				</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getFullBranch</span><span class="p">()).</span><span class="na">getLastEntry</span><span class="p">()</span>
<span class="w">				</span><span class="p">.</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testFastForward</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">second</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">)).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">FAST_FORWARD</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">second</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">		</span><span class="n">RefDatabase</span><span class="w"> </span><span class="n">refDb</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRefDatabase</span><span class="p">();</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge refs/heads/master: Fast-forward&quot;</span><span class="p">,</span>
<span class="w">				</span><span class="n">refDb</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">)</span>
<span class="w">						</span><span class="p">.</span><span class="na">getLastEntry</span><span class="p">().</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge refs/heads/master: Fast-forward&quot;</span><span class="p">,</span>
<span class="w">				</span><span class="n">refDb</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getFullBranch</span><span class="p">())</span>
<span class="w">						</span><span class="p">.</span><span class="na">getLastEntry</span><span class="p">().</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testFastForwardNoCommit</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">second</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">))</span>
<span class="w">					</span><span class="p">.</span><span class="na">setCommit</span><span class="p">(</span><span class="kc">false</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">FAST_FORWARD</span><span class="p">,</span>
<span class="w">					</span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">second</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">		</span><span class="n">RefDatabase</span><span class="w"> </span><span class="n">refDb</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRefDatabase</span><span class="p">();</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge refs/heads/master: Fast-forward&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">refDb</span>
<span class="w">				</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">).</span><span class="na">getLastEntry</span><span class="p">().</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge refs/heads/master: Fast-forward&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">refDb</span>
<span class="w">				</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getFullBranch</span><span class="p">()).</span><span class="na">getLastEntry</span><span class="p">()</span>
<span class="w">				</span><span class="p">.</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testFastForwardWithFiles</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">second</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">)).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">FAST_FORWARD</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">second</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">		</span><span class="n">RefDatabase</span><span class="w"> </span><span class="n">refDb</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRefDatabase</span><span class="p">();</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge refs/heads/master: Fast-forward&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">refDb</span>
<span class="w">				</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">).</span><span class="na">getLastEntry</span><span class="p">().</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge refs/heads/master: Fast-forward&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">refDb</span>
<span class="w">				</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getFullBranch</span><span class="p">()).</span><span class="na">getLastEntry</span><span class="p">()</span>
<span class="w">				</span><span class="p">.</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMultipleHeads</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">second</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file3&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;third commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">MergeCommand</span><span class="w"> </span><span class="n">merge</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">();</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">second</span><span class="p">.</span><span class="na">getId</span><span class="p">());</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">));</span>
<span class="w">			</span><span class="k">try</span><span class="w"> </span><span class="p">{</span>
<span class="w">				</span><span class="n">merge</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">				</span><span class="n">fail</span><span class="p">(</span><span class="s">&quot;Expected exception not thrown when merging multiple heads&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="p">}</span><span class="w"> </span><span class="k">catch</span><span class="w"> </span><span class="p">(</span><span class="n">InvalidMergeHeadsException</span><span class="w"> </span><span class="n">e</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">				</span><span class="c1">// expected this exception</span>
<span class="w">			</span><span class="p">}</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Theory</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeSuccessAllStrategies</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="w"> </span><span class="n">mergeStrategy</span><span class="p">)</span>
<span class="w">			</span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;first&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;third&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">mergeStrategy</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">)).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">		</span><span class="n">RefDatabase</span><span class="w"> </span><span class="n">refDb</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRefDatabase</span><span class="p">();</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">				</span><span class="s">&quot;merge refs/heads/master: Merge made by &quot;</span>
<span class="w">						</span><span class="o">+</span><span class="w"> </span><span class="n">mergeStrategy</span><span class="p">.</span><span class="na">getName</span><span class="p">()</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="s">&quot;.&quot;</span><span class="p">,</span>
<span class="w">				</span><span class="n">refDb</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">).</span><span class="na">getLastEntry</span><span class="p">()</span>
<span class="w">						</span><span class="p">.</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">				</span><span class="s">&quot;merge refs/heads/master: Merge made by &quot;</span>
<span class="w">						</span><span class="o">+</span><span class="w"> </span><span class="n">mergeStrategy</span><span class="p">.</span><span class="na">getName</span><span class="p">()</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="s">&quot;.&quot;</span><span class="p">,</span>
<span class="w">				</span><span class="n">refDb</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getFullBranch</span><span class="p">()).</span><span class="na">getLastEntry</span><span class="p">()</span>
<span class="w">						</span><span class="p">.</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Theory</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeSuccessAllStrategiesNoCommit</span><span class="p">(</span>
<span class="w">			</span><span class="n">MergeStrategy</span><span class="w"> </span><span class="n">mergeStrategy</span><span class="p">)</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;first&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">thirdCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;third&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">mergeStrategy</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setCommit</span><span class="p">(</span><span class="kc">false</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">)).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED_NOT_COMMITTED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">).</span><span class="na">getTarget</span><span class="p">().</span><span class="na">getObjectId</span><span class="p">(),</span>
<span class="w">					</span><span class="n">thirdCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testContentMerge</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;1\n&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\na(main)\n=======\na(side)\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; 86503e7e397465588cc267b65d778538bffccb83\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">size</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">3</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">get</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">)</span><span class="o">[</span><span class="mi">0</span><span class="o">]</span><span class="p">.</span><span class="na">length</span><span class="p">);</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">MERGING</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testContentMergeXtheirs</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n4\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(side)\n3\n4\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n4\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setContentMergeStrategy</span><span class="p">(</span><span class="n">ContentMergeStrategy</span><span class="p">.</span><span class="na">THEIRS</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\na(side)\n3\n4\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n4\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">SAFE</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testContentMergeXours</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n4\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(side)\n3\n4\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n4\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setContentMergeStrategy</span><span class="p">(</span><span class="n">ContentMergeStrategy</span><span class="p">.</span><span class="na">OURS</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\na(main)\n3\n4\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n4\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">SAFE</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testBinaryContentMerge</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;.gitattributes&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a binary&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;initial&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;.&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;main&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="c1">// Hmmm... there doesn&#39;t seem to be a way to figure out which files</span>
<span class="w">			</span><span class="c1">// had a binary conflict from a MergeResult...</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">MERGING</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testBinaryContentMergeXtheirs</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;.gitattributes&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a binary&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;initial&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;.&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;main&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setContentMergeStrategy</span><span class="p">(</span><span class="n">ContentMergeStrategy</span><span class="p">.</span><span class="na">THEIRS</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">SAFE</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testBinaryContentMergeXours</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;.gitattributes&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a binary&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;initial&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;.&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;main&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setContentMergeStrategy</span><span class="p">(</span><span class="n">ContentMergeStrategy</span><span class="p">.</span><span class="na">OURS</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">SAFE</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeTag</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">Ref</span><span class="w"> </span><span class="n">tag</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">tag</span><span class="p">().</span><span class="na">setAnnotated</span><span class="p">(</span><span class="kc">true</span><span class="p">).</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;my tag 01&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setName</span><span class="p">(</span><span class="s">&quot;tag01&quot;</span><span class="p">).</span><span class="na">setObjectId</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">tag</span><span class="p">).</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeMessage</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">Ref</span><span class="w"> </span><span class="n">sideBranch</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideBranch</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;Merge branch &#39;side&#39;\n\n# Conflicts:\n#\ta\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>

<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeNonVersionedPaths</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nd\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;e&quot;</span><span class="p">).</span><span class="na">mkdir</span><span class="p">());</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;1\n&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\na(main)\n=======\na(side)\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; 86503e7e397465588cc267b65d778538bffccb83\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nd\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;d&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">File</span><span class="w"> </span><span class="n">dir</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;e&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">dir</span><span class="p">.</span><span class="na">isDirectory</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">size</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">3</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">get</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">)</span><span class="o">[</span><span class="mi">0</span><span class="o">]</span><span class="p">.</span><span class="na">length</span><span class="p">);</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">MERGING</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMultipleCreations</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMultipleCreationsSameContent</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(1)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(1)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(1)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">RefDatabase</span><span class="w"> </span><span class="n">refDb</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRefDatabase</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;merge &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">().</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;: Merge made by resolve.&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">refDb</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">).</span><span class="na">getLastEntry</span><span class="p">()</span>
<span class="w">							</span><span class="p">.</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;merge &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">().</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;: Merge made by resolve.&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">refDb</span><span class="p">.</span><span class="na">getReflogReader</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getFullBranch</span><span class="p">()).</span><span class="na">getLastEntry</span><span class="p">()</span>
<span class="w">							</span><span class="p">.</span><span class="na">getComment</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testSuccessfulContentMerge</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1(side)\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3(main)\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">thirdCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1(side)\na\n3(main)\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span>
<span class="w">					</span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span>
<span class="w">					</span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="kc">null</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">2</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">().</span><span class="na">length</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">thirdCommit</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">()</span><span class="o">[</span><span class="mi">0</span><span class="o">]</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">()</span><span class="o">[</span><span class="mi">1</span><span class="o">]</span><span class="p">);</span>

<span class="w">			</span><span class="n">Iterator</span><span class="o">&lt;</span><span class="n">RevCommit</span><span class="o">&gt;</span><span class="w"> </span><span class="n">it</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">log</span><span class="p">().</span><span class="na">call</span><span class="p">().</span><span class="na">iterator</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">newHead</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">it</span><span class="p">.</span><span class="na">next</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">newHead</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">2</span><span class="p">,</span><span class="w"> </span><span class="n">newHead</span><span class="p">.</span><span class="na">getParentCount</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">thirdCommit</span><span class="p">,</span><span class="w"> </span><span class="n">newHead</span><span class="p">.</span><span class="na">getParent</span><span class="p">(</span><span class="mi">0</span><span class="p">));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">,</span><span class="w"> </span><span class="n">newHead</span><span class="p">.</span><span class="na">getParent</span><span class="p">(</span><span class="mi">1</span><span class="p">));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;Merge commit &#39;3fa334456d236a92db020289fe0bf481d91777b4&#39;&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">newHead</span><span class="p">.</span><span class="na">getFullMessage</span><span class="p">());</span>
<span class="w">			</span><span class="c1">// @TODO fix me</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">SAFE</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">			</span><span class="c1">// test index state</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testSuccessfulContentMergeNoCommit</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1(side)\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3(main)\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">thirdCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setCommit</span><span class="p">(</span><span class="kc">false</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED_NOT_COMMITTED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="p">).</span><span class="na">getTarget</span><span class="p">().</span><span class="na">getObjectId</span><span class="p">(),</span>
<span class="w">					</span><span class="n">thirdCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1(side)\na\n3(main)\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span>
<span class="w">					</span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="kc">null</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">2</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">().</span><span class="na">length</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">thirdCommit</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">()</span><span class="o">[</span><span class="mi">0</span><span class="o">]</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">()</span><span class="o">[</span><span class="mi">1</span><span class="o">]</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">MERGING_RESOLVED</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testSuccessfulContentMergeAndDirtyworkingTree</span><span class="p">()</span>
<span class="w">			</span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nd\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1(side)\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3(main)\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">thirdCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;--- dirty ---&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1(side)\na\n3(main)\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span>
<span class="w">					</span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span>
<span class="w">					</span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;--- dirty ---&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;d&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="kc">null</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">2</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">().</span><span class="na">length</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">thirdCommit</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">()</span><span class="o">[</span><span class="mi">0</span><span class="o">]</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">()</span><span class="o">[</span><span class="mi">1</span><span class="o">]</span><span class="p">);</span>

<span class="w">			</span><span class="n">Iterator</span><span class="o">&lt;</span><span class="n">RevCommit</span><span class="o">&gt;</span><span class="w"> </span><span class="n">it</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">log</span><span class="p">().</span><span class="na">call</span><span class="p">().</span><span class="na">iterator</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">newHead</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">it</span><span class="p">.</span><span class="na">next</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">newHead</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">2</span><span class="p">,</span><span class="w"> </span><span class="n">newHead</span><span class="p">.</span><span class="na">getParentCount</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">thirdCommit</span><span class="p">,</span><span class="w"> </span><span class="n">newHead</span><span class="p">.</span><span class="na">getParent</span><span class="p">(</span><span class="mi">0</span><span class="p">));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">,</span><span class="w"> </span><span class="n">newHead</span><span class="p">.</span><span class="na">getParent</span><span class="p">(</span><span class="mi">1</span><span class="p">));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;Merge commit &#39;064d54d98a4cdb0fed1802a21c656bfda67fe879&#39;&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">newHead</span><span class="p">.</span><span class="na">getFullMessage</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">SAFE</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testSingleDeletion</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nd\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">delete</span><span class="p">());</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">setUpdate</span><span class="p">(</span><span class="kc">true</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3(main)\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">thirdCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// We are merging a deletion into our branch</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\na\n3(main)\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nd\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;d&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="c1">// Do the opposite, be on a branch where we have deleted a file and</span>
<span class="w">			</span><span class="c1">// merge in a old commit where this file was not deleted</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">thirdCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\na\n3(main)\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nd\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;d&quot;</span><span class="p">)));</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMultipleDeletions</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">delete</span><span class="p">());</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">setUpdate</span><span class="p">(</span><span class="kc">true</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">delete</span><span class="p">());</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">setUpdate</span><span class="p">(</span><span class="kc">true</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// We are merging a deletion into our branch</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testDeletionAndConflict</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nd\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">delete</span><span class="p">());</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3(side)\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">setUpdate</span><span class="p">(</span><span class="kc">true</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">setUpdate</span><span class="p">(</span><span class="kc">true</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3(main)\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// We are merging a deletion into our branch</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;1\na\n&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD\n3(main)\n=======\n3(side)\n&gt;&gt;&gt;&gt;&gt;&gt;&gt; 54ffed45d62d252715fc20e41da92d44c48fb0ff\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c/c/c&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nd\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;d&quot;</span><span class="p">)));</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testDeletionOnMasterConflict</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// create side branch and modify &quot;a&quot;</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// delete a on master to generate conflict</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">thirdCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="k">for</span><span class="w"> </span><span class="p">(</span><span class="n">ContentMergeStrategy</span><span class="w"> </span><span class="n">contentStrategy</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="n">ContentMergeStrategy</span>
<span class="w">					</span><span class="p">.</span><span class="na">values</span><span class="p">())</span><span class="w"> </span><span class="p">{</span>
<span class="w">				</span><span class="c1">// merge side with master</span>
<span class="w">				</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">						</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">						</span><span class="p">.</span><span class="na">setContentMergeStrategy</span><span class="p">(</span><span class="n">contentStrategy</span><span class="p">)</span>
<span class="w">						</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">				</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span>
<span class="w">						</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">				</span><span class="c1">// result should be &#39;a&#39; conflicting with workspace content from</span>
<span class="w">				</span><span class="c1">// side</span>
<span class="w">				</span><span class="n">assertTrue</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span>
<span class="w">						</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">				</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span>
<span class="w">						</span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">,</span>
<span class="w">						</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">				</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span>
<span class="w">						</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">				</span><span class="n">git</span><span class="p">.</span><span class="na">reset</span><span class="p">().</span><span class="na">setMode</span><span class="p">(</span><span class="n">ResetType</span><span class="p">.</span><span class="na">HARD</span><span class="p">).</span><span class="na">setRef</span><span class="p">(</span><span class="n">thirdCommit</span><span class="p">.</span><span class="na">name</span><span class="p">())</span>
<span class="w">						</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="p">}</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testDeletionOnMasterTheirs</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// create side branch and modify &quot;a&quot;</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// delete a on master to generate conflict</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// merge side with master</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">THEIRS</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="c1">// result should be &#39;a&#39;</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">git</span><span class="p">.</span><span class="na">status</span><span class="p">().</span><span class="na">call</span><span class="p">().</span><span class="na">isClean</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testDeletionOnMasterOurs</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// create side branch and modify &quot;a&quot;</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// delete a on master to generate conflict</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// merge side with master</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">OURS</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">git</span><span class="p">.</span><span class="na">status</span><span class="p">().</span><span class="na">call</span><span class="p">().</span><span class="na">isClean</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testDeletionOnSideConflict</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// create side branch and delete &quot;a&quot;</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// update a on master to generate conflict</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">thirdCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="k">for</span><span class="w"> </span><span class="p">(</span><span class="n">ContentMergeStrategy</span><span class="w"> </span><span class="n">contentStrategy</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="n">ContentMergeStrategy</span>
<span class="w">					</span><span class="p">.</span><span class="na">values</span><span class="p">())</span><span class="w"> </span><span class="p">{</span>
<span class="w">				</span><span class="c1">// merge side with master</span>
<span class="w">				</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">						</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">						</span><span class="p">.</span><span class="na">setContentMergeStrategy</span><span class="p">(</span><span class="n">contentStrategy</span><span class="p">)</span>
<span class="w">						</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">				</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span>
<span class="w">						</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">				</span><span class="n">assertTrue</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span>
<span class="w">						</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">				</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span>
<span class="w">						</span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">						</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">				</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span>
<span class="w">						</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">				</span><span class="n">assertNotNull</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span>
<span class="w">						</span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>
<span class="w">				</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span>
<span class="w">						</span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">size</span><span class="p">());</span>
<span class="w">				</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;merge -X &quot;</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">contentStrategy</span><span class="p">.</span><span class="na">name</span><span class="p">(),</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span>
<span class="w">						</span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">get</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">)</span><span class="o">[</span><span class="mi">0</span><span class="o">]</span><span class="p">.</span><span class="na">length</span><span class="p">);</span>
<span class="w">				</span><span class="n">git</span><span class="p">.</span><span class="na">reset</span><span class="p">().</span><span class="na">setMode</span><span class="p">(</span><span class="n">ResetType</span><span class="p">.</span><span class="na">HARD</span><span class="p">).</span><span class="na">setRef</span><span class="p">(</span><span class="n">thirdCommit</span><span class="p">.</span><span class="na">name</span><span class="p">())</span>
<span class="w">						</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="p">}</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testDeletionOnSideTheirs</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// create side branch and delete &quot;a&quot;</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// update a on master to generate conflict</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// merge side with master</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">THEIRS</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">git</span><span class="p">.</span><span class="na">status</span><span class="p">().</span><span class="na">call</span><span class="p">().</span><span class="na">isClean</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testDeletionOnSideOurs</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// create side branch and delete &quot;a&quot;</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// update a on master to generate conflict</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// merge side with master</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">OURS</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">git</span><span class="p">.</span><span class="na">status</span><span class="p">().</span><span class="na">call</span><span class="p">().</span><span class="na">isClean</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testModifiedAndRenamed</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="c1">// this test is essentially the same as testDeletionOnSideConflict,</span>
<span class="w">		</span><span class="c1">// however if once rename support is added this test should result in a</span>
<span class="w">		</span><span class="c1">// successful merge instead of a conflict</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;x&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;add x&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;x&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initial</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;add x&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initial</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/d1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initial</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/d2&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// rename x to y on d1</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/d1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;x&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">renameTo</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;y&quot;</span><span class="p">));</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;x&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;y&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">d1Commit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;d1 rename x -&gt; y&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/d2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;x&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;d2 change&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;x&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">d2Commit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;d2 change in x&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">d1Merge</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">d1Commit</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">FAST_FORWARD</span><span class="p">,</span>
<span class="w">					</span><span class="n">d1Merge</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">d2Merge</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">d2Commit</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span>
<span class="w">					</span><span class="n">d2Merge</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span><span class="w"> </span><span class="n">d2Merge</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">size</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">3</span><span class="p">,</span><span class="w"> </span><span class="n">d2Merge</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">get</span><span class="p">(</span><span class="s">&quot;x&quot;</span><span class="p">)</span><span class="o">[</span><span class="mi">0</span><span class="o">]</span><span class="p">.</span><span class="na">length</span><span class="p">);</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeFailingWithDirtyWorkingTree</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1(side)\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb(side)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3(main)\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;--- dirty ---&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">FAILED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;--- dirty ---&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="kc">null</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">SAFE</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeConflictFileFolder</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nd(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c/c/c&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;d&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;d/d/d&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nd(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c&quot;</span><span class="p">).</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;d/d/d&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nc(main)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c&quot;</span><span class="p">)));</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;1\nd(main)\n3\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;d/d/d&quot;</span><span class="p">)));</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="kc">null</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">MERGING</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testSuccessfulMergeFailsDueToDirtyIndex</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">File</span><span class="w"> </span><span class="n">fileA</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="c1">// modify file a</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(side)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">sideCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;c&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// modify and add file a</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(modified)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="c1">// do not commit</span>

<span class="w">			</span><span class="c1">// get current index state</span>
<span class="w">			</span><span class="n">String</span><span class="w"> </span><span class="n">indexState</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">indexState</span><span class="p">(</span><span class="n">CONTENT</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// merge</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkMergeFailedResult</span><span class="p">(</span><span class="n">result</span><span class="p">,</span><span class="w"> </span><span class="n">MergeFailureReason</span><span class="p">.</span><span class="na">DIRTY_INDEX</span><span class="p">,</span>
<span class="w">					</span><span class="n">indexState</span><span class="p">,</span><span class="w"> </span><span class="n">fileA</span><span class="p">);</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testConflictingMergeFailsDueToDirtyIndex</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">File</span><span class="w"> </span><span class="n">fileA</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="c1">// modify file a</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(side)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">sideCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="c1">// modify file a - this will cause a conflict during merge</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(master)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;c&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// modify and add file a</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(modified)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="c1">// do not commit</span>

<span class="w">			</span><span class="c1">// get current index state</span>
<span class="w">			</span><span class="n">String</span><span class="w"> </span><span class="n">indexState</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">indexState</span><span class="p">(</span><span class="n">CONTENT</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// merge</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkMergeFailedResult</span><span class="p">(</span><span class="n">result</span><span class="p">,</span><span class="w"> </span><span class="n">MergeFailureReason</span><span class="p">.</span><span class="na">DIRTY_INDEX</span><span class="p">,</span>
<span class="w">					</span><span class="n">indexState</span><span class="p">,</span><span class="w"> </span><span class="n">fileA</span><span class="p">);</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testSuccessfulMergeFailsDueToDirtyWorktree</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">File</span><span class="w"> </span><span class="n">fileA</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="c1">// modify file a</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(side)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">sideCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;c&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// modify file a</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(modified)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="c1">// do not add and commit</span>

<span class="w">			</span><span class="c1">// get current index state</span>
<span class="w">			</span><span class="n">String</span><span class="w"> </span><span class="n">indexState</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">indexState</span><span class="p">(</span><span class="n">CONTENT</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// merge</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkMergeFailedResult</span><span class="p">(</span><span class="n">result</span><span class="p">,</span><span class="w"> </span><span class="n">MergeFailureReason</span><span class="p">.</span><span class="na">DIRTY_WORKTREE</span><span class="p">,</span>
<span class="w">					</span><span class="n">indexState</span><span class="p">,</span><span class="w"> </span><span class="n">fileA</span><span class="p">);</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testConflictingMergeFailsDueToDirtyWorktree</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">File</span><span class="w"> </span><span class="n">fileA</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="c1">// modify file a</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(side)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">sideCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="c1">// modify file a - this will cause a conflict during merge</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(master)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;c&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// modify file a</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">fileA</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a(modified)&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="c1">// do not add and commit</span>

<span class="w">			</span><span class="c1">// get current index state</span>
<span class="w">			</span><span class="n">String</span><span class="w"> </span><span class="n">indexState</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">indexState</span><span class="p">(</span><span class="n">CONTENT</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// merge</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkMergeFailedResult</span><span class="p">(</span><span class="n">result</span><span class="p">,</span><span class="w"> </span><span class="n">MergeFailureReason</span><span class="p">.</span><span class="na">DIRTY_WORKTREE</span><span class="p">,</span>
<span class="w">					</span><span class="n">indexState</span><span class="p">,</span><span class="w"> </span><span class="n">fileA</span><span class="p">);</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeRemovingFolders</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="n">File</span><span class="w"> </span><span class="n">folder1</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;folder1&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">File</span><span class="w"> </span><span class="n">folder2</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;folder2&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">FileUtils</span><span class="p">.</span><span class="na">mkdir</span><span class="p">(</span><span class="n">folder1</span><span class="p">);</span>
<span class="w">		</span><span class="n">FileUtils</span><span class="p">.</span><span class="na">mkdir</span><span class="p">(</span><span class="n">folder2</span><span class="p">);</span>
<span class="w">		</span><span class="n">File</span><span class="w"> </span><span class="n">file</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">folder1</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file1.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">write</span><span class="p">(</span><span class="n">file</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;folder1--file1.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">file</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">folder1</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file2.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">write</span><span class="p">(</span><span class="n">file</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;folder1--file2.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">file</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">folder2</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file1.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">write</span><span class="p">(</span><span class="n">file</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;folder--file1.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">file</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">folder2</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file2.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">write</span><span class="p">(</span><span class="n">file</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;folder2--file2.txt&quot;</span><span class="p">);</span>

<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="n">folder1</span><span class="p">.</span><span class="na">getName</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="n">folder2</span><span class="p">.</span><span class="na">getName</span><span class="p">()).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">commit1</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;adding folders&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">recursiveDelete</span><span class="p">(</span><span class="n">folder1</span><span class="p">);</span>
<span class="w">			</span><span class="n">recursiveDelete</span><span class="p">(</span><span class="n">folder2</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;folder1/file1.txt&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;folder1/file2.txt&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;folder2/file1.txt&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;folder2/file2.txt&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">commit2</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">()</span>
<span class="w">					</span><span class="p">.</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;removing folders on &#39;branch&#39;&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">checkout</span><span class="p">().</span><span class="na">setName</span><span class="p">(</span><span class="n">commit1</span><span class="p">.</span><span class="na">name</span><span class="p">()).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">commit2</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">FAST_FORWARD</span><span class="p">,</span>
<span class="w">					</span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">commit2</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="n">folder1</span><span class="p">.</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="n">folder2</span><span class="p">.</span><span class="na">exists</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeRemovingFoldersWithoutFastForward</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="n">File</span><span class="w"> </span><span class="n">folder1</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;folder1&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">File</span><span class="w"> </span><span class="n">folder2</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;folder2&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">FileUtils</span><span class="p">.</span><span class="na">mkdir</span><span class="p">(</span><span class="n">folder1</span><span class="p">);</span>
<span class="w">		</span><span class="n">FileUtils</span><span class="p">.</span><span class="na">mkdir</span><span class="p">(</span><span class="n">folder2</span><span class="p">);</span>
<span class="w">		</span><span class="n">File</span><span class="w"> </span><span class="n">file</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">folder1</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file1.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">write</span><span class="p">(</span><span class="n">file</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;folder1--file1.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">file</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">folder1</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file2.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">write</span><span class="p">(</span><span class="n">file</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;folder1--file2.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">file</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">folder2</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file1.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">write</span><span class="p">(</span><span class="n">file</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;folder--file1.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">file</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">folder2</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file2.txt&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">write</span><span class="p">(</span><span class="n">file</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;folder2--file2.txt&quot;</span><span class="p">);</span>

<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="n">folder1</span><span class="p">.</span><span class="na">getName</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="n">folder2</span><span class="p">.</span><span class="na">getName</span><span class="p">()).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">base</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;adding folders&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">recursiveDelete</span><span class="p">(</span><span class="n">folder1</span><span class="p">);</span>
<span class="w">			</span><span class="n">recursiveDelete</span><span class="p">(</span><span class="n">folder2</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;folder1/file1.txt&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;folder1/file2.txt&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;folder2/file1.txt&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;folder2/file2.txt&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">other</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">()</span>
<span class="w">					</span><span class="p">.</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;removing folders on &#39;branch&#39;&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">checkout</span><span class="p">().</span><span class="na">setName</span><span class="p">(</span><span class="n">base</span><span class="p">.</span><span class="na">name</span><span class="p">()).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">file</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">folder2</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file3.txt&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">write</span><span class="p">(</span><span class="n">file</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;folder2--file3.txt&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="n">folder2</span><span class="p">.</span><span class="na">getName</span><span class="p">()).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;adding another file&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">other</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span>
<span class="w">					</span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="n">folder1</span><span class="p">.</span><span class="na">exists</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testFileModeMerge</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="c1">// Only Java6</span>
<span class="w">		</span><span class="n">assumeTrue</span><span class="p">(</span><span class="n">FS</span><span class="p">.</span><span class="na">DETECTED</span><span class="p">.</span><span class="na">supportsExecute</span><span class="p">());</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;mergeableMode&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">setExecutable</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;mergeableMode&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">false</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;conflictingModeWithBase&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">setExecutable</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;conflictingModeWithBase&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">false</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">setExecutable</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;mergeableMode&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">true</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;conflictingModeNoBase&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">setExecutable</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;conflictingModeNoBase&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">true</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">sideCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">setExecutable</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;mergeableMode&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">false</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">git</span><span class="p">.</span><span class="na">getRepository</span><span class="p">().</span><span class="na">getWorkTree</span><span class="p">(),</span>
<span class="w">					</span><span class="s">&quot;conflictingModeNoBase&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;conflictingModeNoBase&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">setExecutable</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;conflictingModeNoBase&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">false</span><span class="p">);</span>
<span class="w">			</span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// merge</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">canExecute</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;mergeableMode&quot;</span><span class="p">));</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="n">canExecute</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;conflictingModeNoBase&quot;</span><span class="p">));</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testFileModeMergeWithDirtyWorkTree</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="c1">// Only Java6 (or set x bit in index)</span>
<span class="w">		</span><span class="n">assumeTrue</span><span class="p">(</span><span class="n">FS</span><span class="p">.</span><span class="na">DETECTED</span><span class="p">.</span><span class="na">supportsExecute</span><span class="p">());</span>

<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;mergeableButDirty&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;a&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">setExecutable</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;mergeableButDirty&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">false</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">setExecutable</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;mergeableButDirty&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">true</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">sideCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// switch branch</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">setExecutable</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;mergeableButDirty&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">false</span><span class="p">);</span>
<span class="w">			</span><span class="n">addAllAndCommit</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;mergeableButDirty&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// merge</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideCommit</span><span class="p">.</span><span class="na">getId</span><span class="p">())</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">FAILED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="n">canExecute</span><span class="p">(</span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;mergeableButDirty&quot;</span><span class="p">));</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testSquashFastForward</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">second</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file3&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">third</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;third commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">()</span>
<span class="w">					</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">))</span>
<span class="w">					</span><span class="p">.</span><span class="na">setSquash</span><span class="p">(</span><span class="kc">true</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">FAST_FORWARD_SQUASHED</span><span class="p">,</span>
<span class="w">					</span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span><span class="w"> </span><span class="c1">// HEAD didn&#39;t move</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">resolve</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="s">&quot;^{commit}&quot;</span><span class="p">));</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;Squashed commit of the following:\n\ncommit &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">third</span><span class="p">.</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;\nAuthor: &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">third</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">().</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot; &lt;&quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">third</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">().</span><span class="na">getEmailAddress</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;&gt;\nDate:   &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">dateFormatter</span><span class="p">.</span><span class="na">formatDate</span><span class="p">(</span><span class="n">third</span>
<span class="w">									</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">())</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;\n\n\tthird commit\n\ncommit &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">second</span><span class="p">.</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;\nAuthor: &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">second</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">().</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot; &lt;&quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">second</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">().</span><span class="na">getEmailAddress</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;&gt;\nDate:   &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">dateFormatter</span><span class="p">.</span><span class="na">formatDate</span><span class="p">(</span><span class="n">second</span>
<span class="w">									</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">())</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="s">&quot;\n\n\tsecond commit\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">db</span><span class="p">.</span><span class="na">readSquashCommitMsg</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>

<span class="w">			</span><span class="n">Status</span><span class="w"> </span><span class="n">stat</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">status</span><span class="p">().</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">Sets</span><span class="p">.</span><span class="na">of</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">),</span><span class="w"> </span><span class="n">stat</span><span class="p">.</span><span class="na">getAdded</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testSquashMerge</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">second</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file3&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">third</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;third commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">()</span>
<span class="w">					</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">))</span>
<span class="w">					</span><span class="p">.</span><span class="na">setSquash</span><span class="p">(</span><span class="kc">true</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file3&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">MERGED_SQUASHED</span><span class="p">,</span>
<span class="w">					</span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">second</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span><span class="w"> </span><span class="c1">// HEAD didn&#39;t move</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">second</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">resolve</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="s">&quot;^{commit}&quot;</span><span class="p">));</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;Squashed commit of the following:\n\ncommit &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">third</span><span class="p">.</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;\nAuthor: &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">third</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">().</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot; &lt;&quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">third</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">().</span><span class="na">getEmailAddress</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;&gt;\nDate:   &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">dateFormatter</span><span class="p">.</span><span class="na">formatDate</span><span class="p">(</span><span class="n">third</span>
<span class="w">									</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">())</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="s">&quot;\n\n\tthird commit\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">db</span><span class="p">.</span><span class="na">readSquashCommitMsg</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>

<span class="w">			</span><span class="n">Status</span><span class="w"> </span><span class="n">stat</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">status</span><span class="p">().</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">Sets</span><span class="p">.</span><span class="na">of</span><span class="p">(</span><span class="s">&quot;file3&quot;</span><span class="p">),</span><span class="w"> </span><span class="n">stat</span><span class="p">.</span><span class="na">getAdded</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testSquashMergeConflict</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">first</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">first</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">second</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;branch&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">third</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;third commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">()</span>
<span class="w">					</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">))</span>
<span class="w">					</span><span class="p">.</span><span class="na">setSquash</span><span class="p">(</span><span class="kc">true</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file1&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;file2&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeResult</span><span class="p">.</span><span class="na">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span>
<span class="w">					</span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">second</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">resolve</span><span class="p">(</span><span class="n">Constants</span><span class="p">.</span><span class="na">HEAD</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="s">&quot;^{commit}&quot;</span><span class="p">));</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span>
<span class="w">					</span><span class="s">&quot;Squashed commit of the following:\n\ncommit &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">third</span><span class="p">.</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;\nAuthor: &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">third</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">().</span><span class="na">getName</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot; &lt;&quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">third</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">().</span><span class="na">getEmailAddress</span><span class="p">()</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="s">&quot;&gt;\nDate:   &quot;</span>
<span class="w">							</span><span class="o">+</span><span class="w"> </span><span class="n">dateFormatter</span><span class="p">.</span><span class="na">formatDate</span><span class="p">(</span><span class="n">third</span>
<span class="w">									</span><span class="p">.</span><span class="na">getAuthorIdent</span><span class="p">())</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="s">&quot;\n\n\tthird commit\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">db</span><span class="p">.</span><span class="na">readSquashCommitMsg</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;\n# Conflicts:\n#\tfile2\n&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>

<span class="w">			</span><span class="n">Status</span><span class="w"> </span><span class="n">stat</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">status</span><span class="p">().</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">Sets</span><span class="p">.</span><span class="na">of</span><span class="p">(</span><span class="s">&quot;file2&quot;</span><span class="p">),</span><span class="w"> </span><span class="n">stat</span><span class="p">.</span><span class="na">getConflicting</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testFastForwardOnly</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">MergeCommand</span><span class="w"> </span><span class="n">merge</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">();</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">setFastForward</span><span class="p">(</span><span class="n">FastForwardMode</span><span class="p">.</span><span class="na">FF_ONLY</span><span class="p">);</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">));</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">merge</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">FAST_FORWARD</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testNoFastForward</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">MergeCommand</span><span class="w"> </span><span class="n">merge</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">();</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">setFastForward</span><span class="p">(</span><span class="n">FastForwardMode</span><span class="p">.</span><span class="na">NO_FF</span><span class="p">);</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">));</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">merge</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testNoFastForwardNoCommit</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="c1">// given</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">secondCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="c1">// when</span>
<span class="w">			</span><span class="n">MergeCommand</span><span class="w"> </span><span class="n">merge</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">();</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">setFastForward</span><span class="p">(</span><span class="n">FastForwardMode</span><span class="p">.</span><span class="na">NO_FF</span><span class="p">);</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">));</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">setCommit</span><span class="p">(</span><span class="kc">false</span><span class="p">);</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">merge</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// then</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED_NOT_COMMITTED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">2</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">().</span><span class="na">length</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">()</span><span class="o">[</span><span class="mi">0</span><span class="o">]</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">secondCommit</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergedCommits</span><span class="p">()</span><span class="o">[</span><span class="mi">1</span><span class="o">]</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">result</span><span class="p">.</span><span class="na">getNewHead</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">MERGING_RESOLVED</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testFastForwardOnlyNotPossible</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial commit&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/branch1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;file1&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;branch1&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;file&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;second commit on branch1&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">MergeCommand</span><span class="w"> </span><span class="n">merge</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">();</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">setFastForward</span><span class="p">(</span><span class="n">FastForwardMode</span><span class="p">.</span><span class="na">FF_ONLY</span><span class="p">);</span>
<span class="w">			</span><span class="n">merge</span><span class="p">.</span><span class="na">include</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="n">R_HEADS</span><span class="w"> </span><span class="o">+</span><span class="w"> </span><span class="n">MASTER</span><span class="p">));</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">merge</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">ABORTED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testRecursiveMergeWithConflict</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">TestRepository</span><span class="o">&lt;</span><span class="n">Repository</span><span class="o">&gt;</span><span class="w"> </span><span class="n">db_t</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">TestRepository</span><span class="o">&lt;&gt;</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">db</span><span class="p">.</span><span class="na">incrementOpen</span><span class="p">();</span>
<span class="w">			</span><span class="n">BranchBuilder</span><span class="w"> </span><span class="n">master</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db_t</span><span class="p">.</span><span class="na">branch</span><span class="p">(</span><span class="s">&quot;master&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">m0</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">master</span><span class="p">.</span><span class="na">commit</span><span class="p">()</span>
<span class="w">					</span><span class="p">.</span><span class="na">add</span><span class="p">(</span><span class="s">&quot;f&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\n2\n3\n4\n5\n6\n7\n8\n9\n&quot;</span><span class="p">).</span><span class="na">message</span><span class="p">(</span><span class="s">&quot;m0&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">create</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">m1</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">master</span><span class="p">.</span><span class="na">commit</span><span class="p">()</span>
<span class="w">					</span><span class="p">.</span><span class="na">add</span><span class="p">(</span><span class="s">&quot;f&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1-master\n2\n3\n4\n5\n6\n7\n8\n9\n&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">message</span><span class="p">(</span><span class="s">&quot;m1&quot;</span><span class="p">).</span><span class="na">create</span><span class="p">();</span>
<span class="w">			</span><span class="n">db_t</span><span class="p">.</span><span class="na">getRevWalk</span><span class="p">().</span><span class="na">parseCommit</span><span class="p">(</span><span class="n">m1</span><span class="p">);</span>

<span class="w">			</span><span class="n">BranchBuilder</span><span class="w"> </span><span class="n">side</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db_t</span><span class="p">.</span><span class="na">branch</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">s1</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">side</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">parent</span><span class="p">(</span><span class="n">m0</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">add</span><span class="p">(</span><span class="s">&quot;f&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\n2\n3\n4\n5\n6\n7\n8\n9-side\n&quot;</span><span class="p">).</span><span class="na">message</span><span class="p">(</span><span class="s">&quot;s1&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">create</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">s2</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">side</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">parent</span><span class="p">(</span><span class="n">m1</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">add</span><span class="p">(</span><span class="s">&quot;f&quot;</span><span class="p">,</span>
<span class="w">							</span><span class="s">&quot;1-master\n2\n3\n4\n5\n6\n7-res(side)\n8\n9-side\n&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">message</span><span class="p">(</span><span class="s">&quot;s2(merge)&quot;</span><span class="p">).</span><span class="na">create</span><span class="p">();</span>
<span class="w">			</span><span class="n">master</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">parent</span><span class="p">(</span><span class="n">s1</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">add</span><span class="p">(</span><span class="s">&quot;f&quot;</span><span class="p">,</span>
<span class="w">							</span><span class="s">&quot;1-master\n2\n3\n4\n5\n6\n7-conflict\n8\n9-side\n&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">message</span><span class="p">(</span><span class="s">&quot;m2(merge)&quot;</span><span class="p">).</span><span class="na">create</span><span class="p">();</span>

<span class="w">			</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">Git</span><span class="p">.</span><span class="na">wrap</span><span class="p">(</span><span class="n">db</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">checkout</span><span class="p">().</span><span class="na">setName</span><span class="p">(</span><span class="s">&quot;master&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">()</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RECURSIVE</span><span class="p">).</span><span class="na">include</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">s2</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="kd">private</span><span class="w"> </span><span class="n">Ref</span><span class="w"> </span><span class="nf">prepareSuccessfulMerge</span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="p">)</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">		</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">		</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">		</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nb\n3\n&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">		</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">		</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">		</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;c&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\nc\n3\n&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;c&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">		</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">		</span><span class="k">return</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeWithMessageOption</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">Ref</span><span class="w"> </span><span class="n">sideBranch</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">prepareSuccessfulMerge</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideBranch</span><span class="p">).</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;user message&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>

<span class="w">			</span><span class="n">Iterator</span><span class="o">&lt;</span><span class="n">RevCommit</span><span class="o">&gt;</span><span class="w"> </span><span class="n">it</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">log</span><span class="p">().</span><span class="na">call</span><span class="p">().</span><span class="na">iterator</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">newHead</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">it</span><span class="p">.</span><span class="na">next</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;user message&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">newHead</span><span class="p">.</span><span class="na">getFullMessage</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeWithChangeId</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">Ref</span><span class="w"> </span><span class="n">sideBranch</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">prepareSuccessfulMerge</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideBranch</span><span class="p">).</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setInsertChangeId</span><span class="p">(</span><span class="kc">true</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>

<span class="w">			</span><span class="n">Iterator</span><span class="o">&lt;</span><span class="n">RevCommit</span><span class="o">&gt;</span><span class="w"> </span><span class="n">it</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">log</span><span class="p">().</span><span class="na">call</span><span class="p">().</span><span class="na">iterator</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">newHead</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">it</span><span class="p">.</span><span class="na">next</span><span class="p">();</span>
<span class="w">			</span><span class="n">String</span><span class="w"> </span><span class="n">commitMessage</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">newHead</span><span class="p">.</span><span class="na">getFullMessage</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">Pattern</span><span class="p">.</span><span class="na">compile</span><span class="p">(</span><span class="s">&quot;\nChange-Id: I[0-9a-fA-F]{40}\n&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">matcher</span><span class="p">(</span><span class="n">commitMessage</span><span class="p">).</span><span class="na">find</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeWithMessageAndChangeId</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">Ref</span><span class="w"> </span><span class="n">sideBranch</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">prepareSuccessfulMerge</span><span class="p">(</span><span class="n">git</span><span class="p">);</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideBranch</span><span class="p">).</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;user message&quot;</span><span class="p">).</span><span class="na">setInsertChangeId</span><span class="p">(</span><span class="kc">true</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertNull</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>

<span class="w">			</span><span class="n">Iterator</span><span class="o">&lt;</span><span class="n">RevCommit</span><span class="o">&gt;</span><span class="w"> </span><span class="n">it</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">log</span><span class="p">().</span><span class="na">call</span><span class="p">().</span><span class="na">iterator</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">newHead</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">it</span><span class="p">.</span><span class="na">next</span><span class="p">();</span>
<span class="w">			</span><span class="n">String</span><span class="w"> </span><span class="n">commitMessage</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">newHead</span><span class="p">.</span><span class="na">getFullMessage</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">commitMessage</span><span class="p">.</span><span class="na">startsWith</span><span class="p">(</span><span class="s">&quot;user message\n\n&quot;</span><span class="p">));</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">Pattern</span><span class="p">.</span><span class="na">compile</span><span class="p">(</span><span class="s">&quot;\nChange-Id: I[0-9a-fA-F]{40}\n&quot;</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">matcher</span><span class="p">(</span><span class="n">commitMessage</span><span class="p">).</span><span class="na">find</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeConflictWithMessageOption</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">Ref</span><span class="w"> </span><span class="n">sideBranch</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideBranch</span><span class="p">).</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;user message&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;user message\n\n# Conflicts:\n#\ta\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeConflictWithMessageAndCommentChar</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">StoredConfig</span><span class="w"> </span><span class="n">config</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getConfig</span><span class="p">();</span>
<span class="w">			</span><span class="n">config</span><span class="p">.</span><span class="na">setString</span><span class="p">(</span><span class="s">&quot;core&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;commentChar&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;^&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">Ref</span><span class="w"> </span><span class="n">sideBranch</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideBranch</span><span class="p">).</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;user message&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;user message\n\n^ Conflicts:\n^\ta\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeConflictWithMessageAndCommentCharAuto</span><span class="p">()</span>
<span class="w">			</span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(side)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/master&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;1\na(main)\n3\n&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;main&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">StoredConfig</span><span class="w"> </span><span class="n">config</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getConfig</span><span class="p">();</span>
<span class="w">			</span><span class="n">config</span><span class="p">.</span><span class="na">setString</span><span class="p">(</span><span class="s">&quot;core&quot;</span><span class="p">,</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;commentChar&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;auto&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">Ref</span><span class="w"> </span><span class="n">sideBranch</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">exactRef</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">sideBranch</span><span class="p">).</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RESOLVE</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;#user message&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;#user message\n\n; Conflicts:\n;\ta\n&quot;</span><span class="p">,</span>
<span class="w">					</span><span class="n">db</span><span class="p">.</span><span class="na">readMergeCommitMsg</span><span class="p">());</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeCaseInsensitiveRename</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="n">Assume</span><span class="p">.</span><span class="na">assumeTrue</span><span class="p">(</span>
<span class="w">				</span><span class="s">&quot;Test makes only sense on a case-insensitive file system&quot;</span><span class="p">,</span>
<span class="w">				</span><span class="n">db</span><span class="p">.</span><span class="na">isWorkTreeCaseInsensitive</span><span class="p">());</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;aaa&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="c1">// &quot;Rename&quot; &quot;a&quot; to &quot;A&quot;</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;A&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;aaa&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;A&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">master</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;rename to A&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;bbb&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// Merge master into side</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">master</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RECURSIVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">MERGED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;A&quot;</span><span class="p">).</span><span class="na">isFile</span><span class="p">());</span>
<span class="w">			</span><span class="c1">// Double check</span>
<span class="w">			</span><span class="kt">boolean</span><span class="w"> </span><span class="n">found</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span><span class="p">;</span>
<span class="w">			</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">DirectoryStream</span><span class="o">&lt;</span><span class="n">Path</span><span class="o">&gt;</span><span class="w"> </span><span class="n">dir</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">Files</span>
<span class="w">					</span><span class="p">.</span><span class="na">newDirectoryStream</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">().</span><span class="na">toPath</span><span class="p">()))</span><span class="w"> </span><span class="p">{</span>
<span class="w">				</span><span class="k">for</span><span class="w"> </span><span class="p">(</span><span class="n">Path</span><span class="w"> </span><span class="n">p</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="n">dir</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">					</span><span class="n">found</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">&quot;A&quot;</span><span class="p">.</span><span class="na">equals</span><span class="p">(</span><span class="n">p</span><span class="p">.</span><span class="na">getFileName</span><span class="p">().</span><span class="na">toString</span><span class="p">());</span>
<span class="w">					</span><span class="k">if</span><span class="w"> </span><span class="p">(</span><span class="n">found</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">						</span><span class="k">break</span><span class="p">;</span>
<span class="w">					</span><span class="p">}</span>
<span class="w">				</span><span class="p">}</span>
<span class="w">			</span><span class="p">}</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">found</span><span class="p">);</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="nd">@Test</span>
<span class="w">	</span><span class="kd">public</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">testMergeCaseInsensitiveRenameConflict</span><span class="p">()</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="n">Assume</span><span class="p">.</span><span class="na">assumeTrue</span><span class="p">(</span>
<span class="w">				</span><span class="s">&quot;Test makes only sense on a case-insensitive file system&quot;</span><span class="p">,</span>
<span class="w">				</span><span class="n">db</span><span class="p">.</span><span class="na">isWorkTreeCaseInsensitive</span><span class="p">());</span>
<span class="w">		</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">Git</span><span class="p">(</span><span class="n">db</span><span class="p">))</span><span class="w"> </span><span class="p">{</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;aaa&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">initialCommit</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;initial&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="c1">// &quot;Rename&quot; &quot;a&quot; to &quot;A&quot; and change it</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">rm</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;A&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;yyy&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;A&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">RevCommit</span><span class="w"> </span><span class="n">master</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;rename to A&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="n">createBranch</span><span class="p">(</span><span class="n">initialCommit</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">checkoutBranch</span><span class="p">(</span><span class="s">&quot;refs/heads/side&quot;</span><span class="p">);</span>

<span class="w">			</span><span class="n">writeTrashFile</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;xxx&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;side&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>

<span class="w">			</span><span class="c1">// Merge master into side</span>
<span class="w">			</span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">merge</span><span class="p">().</span><span class="na">include</span><span class="p">(</span><span class="n">master</span><span class="p">)</span>
<span class="w">					</span><span class="p">.</span><span class="na">setStrategy</span><span class="p">(</span><span class="n">MergeStrategy</span><span class="p">.</span><span class="na">RECURSIVE</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">CONFLICTING</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">			</span><span class="n">File</span><span class="w"> </span><span class="n">a</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;A&quot;</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">a</span><span class="p">.</span><span class="na">isFile</span><span class="p">());</span>
<span class="w">			</span><span class="c1">// Double check</span>
<span class="w">			</span><span class="kt">boolean</span><span class="w"> </span><span class="n">found</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="kc">true</span><span class="p">;</span>
<span class="w">			</span><span class="k">try</span><span class="w"> </span><span class="p">(</span><span class="n">DirectoryStream</span><span class="o">&lt;</span><span class="n">Path</span><span class="o">&gt;</span><span class="w"> </span><span class="n">dir</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="n">Files</span>
<span class="w">					</span><span class="p">.</span><span class="na">newDirectoryStream</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">().</span><span class="na">toPath</span><span class="p">()))</span><span class="w"> </span><span class="p">{</span>
<span class="w">				</span><span class="k">for</span><span class="w"> </span><span class="p">(</span><span class="n">Path</span><span class="w"> </span><span class="n">p</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="n">dir</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">					</span><span class="n">found</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">&quot;A&quot;</span><span class="p">.</span><span class="na">equals</span><span class="p">(</span><span class="n">p</span><span class="p">.</span><span class="na">getFileName</span><span class="p">().</span><span class="na">toString</span><span class="p">());</span>
<span class="w">					</span><span class="k">if</span><span class="w"> </span><span class="p">(</span><span class="n">found</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">						</span><span class="k">break</span><span class="p">;</span>
<span class="w">					</span><span class="p">}</span>
<span class="w">				</span><span class="p">}</span>
<span class="w">			</span><span class="p">}</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">found</span><span class="p">);</span>
<span class="w">			</span><span class="n">assertEquals</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">size</span><span class="p">());</span>
<span class="w">			</span><span class="n">assertTrue</span><span class="p">(</span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">().</span><span class="na">containsKey</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">));</span>
<span class="w">			</span><span class="n">checkFile</span><span class="p">(</span><span class="n">a</span><span class="p">,</span><span class="w"> </span><span class="s">&quot;yyy&quot;</span><span class="p">);</span>
<span class="w">		</span><span class="p">}</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="kd">private</span><span class="w"> </span><span class="kd">static</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">setExecutable</span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="n">String</span><span class="w"> </span><span class="n">path</span><span class="p">,</span><span class="w"> </span><span class="kt">boolean</span><span class="w"> </span><span class="n">executable</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="n">FS</span><span class="p">.</span><span class="na">DETECTED</span><span class="p">.</span><span class="na">setExecute</span><span class="p">(</span>
<span class="w">				</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">git</span><span class="p">.</span><span class="na">getRepository</span><span class="p">().</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="n">path</span><span class="p">),</span><span class="w"> </span><span class="n">executable</span><span class="p">);</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="kd">private</span><span class="w"> </span><span class="kd">static</span><span class="w"> </span><span class="kt">boolean</span><span class="w"> </span><span class="nf">canExecute</span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="p">,</span><span class="w"> </span><span class="n">String</span><span class="w"> </span><span class="n">path</span><span class="p">)</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="k">return</span><span class="w"> </span><span class="n">FS</span><span class="p">.</span><span class="na">DETECTED</span><span class="p">.</span><span class="na">canExecute</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">git</span><span class="p">.</span><span class="na">getRepository</span><span class="p">()</span>
<span class="w">				</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="n">path</span><span class="p">));</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="kd">private</span><span class="w"> </span><span class="kd">static</span><span class="w"> </span><span class="n">RevCommit</span><span class="w"> </span><span class="nf">addAllAndCommit</span><span class="p">(</span><span class="n">Git</span><span class="w"> </span><span class="n">git</span><span class="p">)</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="n">git</span><span class="p">.</span><span class="na">add</span><span class="p">().</span><span class="na">addFilepattern</span><span class="p">(</span><span class="s">&quot;.&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">		</span><span class="k">return</span><span class="w"> </span><span class="n">git</span><span class="p">.</span><span class="na">commit</span><span class="p">().</span><span class="na">setMessage</span><span class="p">(</span><span class="s">&quot;message&quot;</span><span class="p">).</span><span class="na">call</span><span class="p">();</span>
<span class="w">	</span><span class="p">}</span>

<span class="w">	</span><span class="kd">private</span><span class="w"> </span><span class="kt">void</span><span class="w"> </span><span class="nf">checkMergeFailedResult</span><span class="p">(</span><span class="kd">final</span><span class="w"> </span><span class="n">MergeResult</span><span class="w"> </span><span class="n">result</span><span class="p">,</span>
<span class="w">			</span><span class="kd">final</span><span class="w"> </span><span class="n">MergeFailureReason</span><span class="w"> </span><span class="n">reason</span><span class="p">,</span>
<span class="w">			</span><span class="kd">final</span><span class="w"> </span><span class="n">String</span><span class="w"> </span><span class="n">indexState</span><span class="p">,</span><span class="w"> </span><span class="kd">final</span><span class="w"> </span><span class="n">File</span><span class="w"> </span><span class="n">fileA</span><span class="p">)</span><span class="w"> </span><span class="kd">throws</span><span class="w"> </span><span class="n">Exception</span><span class="w"> </span><span class="p">{</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">MergeStatus</span><span class="p">.</span><span class="na">FAILED</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getMergeStatus</span><span class="p">());</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">reason</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getFailingPaths</span><span class="p">().</span><span class="na">get</span><span class="p">(</span><span class="s">&quot;a&quot;</span><span class="p">));</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;a(modified)&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="n">fileA</span><span class="p">));</span>
<span class="w">		</span><span class="n">assertFalse</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;b&quot;</span><span class="p">).</span><span class="na">exists</span><span class="p">());</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="s">&quot;c&quot;</span><span class="p">,</span><span class="w"> </span><span class="n">read</span><span class="p">(</span><span class="k">new</span><span class="w"> </span><span class="n">File</span><span class="p">(</span><span class="n">db</span><span class="p">.</span><span class="na">getWorkTree</span><span class="p">(),</span><span class="w"> </span><span class="s">&quot;c&quot;</span><span class="p">)));</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">indexState</span><span class="p">,</span><span class="w"> </span><span class="n">indexState</span><span class="p">(</span><span class="n">CONTENT</span><span class="p">));</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="kc">null</span><span class="p">,</span><span class="w"> </span><span class="n">result</span><span class="p">.</span><span class="na">getConflicts</span><span class="p">());</span>
<span class="w">		</span><span class="n">assertEquals</span><span class="p">(</span><span class="n">RepositoryState</span><span class="p">.</span><span class="na">SAFE</span><span class="p">,</span><span class="w"> </span><span class="n">db</span><span class="p">.</span><span class="na">getRepositoryState</span><span class="p">());</span>
<span class="w">	</span><span class="p">}</span>
<span class="p">}</span>
</pre></div>
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class='footer'>generated by <a href='https://git.zx2c4.com/cgit/about/'>cgit v1.2.3</a> (<a href='https://git-scm.com/'>git 2.39.1</a>) at 2025-07-24 05:06:17 +0000</div>
</div> <!-- id=cgit -->
</body>
</html>
